Commit 39143ca2 authored by Narayan Kamath's avatar Narayan Kamath Committed by Android Git Automerger
Browse files

am 5a64f9c2: am 5ef7bff6: Merge "Allow cts-tradefed to be run with java7." 

* commit '5a64f9c2':
  Allow cts-tradefed to be run with java7.
parents 7a2d6229 5a64f9c2
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment