Commit 5a64f9c2 authored by Narayan Kamath's avatar Narayan Kamath Committed by Android Git Automerger
Browse files

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

* commit '5ef7bff6':
  Allow cts-tradefed to be run with java7.
parents 4f0ae853 5ef7bff6
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