Commit 330183bc authored by Narayan Kamath's avatar Narayan Kamath Committed by Android Git Automerger
Browse files

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

* commit '39143ca2':
  Allow cts-tradefed to be run with java7.
parents 430d48ba 39143ca2
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