Commit 5a5149b4 authored by Guru Nagarajan's avatar Guru Nagarajan Committed by Android Git Automerger
Browse files

am 6f6e4a6f: (-s ours) am 9519b556: (-s ours) am 10cac527: (-s ours) am... 

am 6f6e4a6f: (-s ours) am 9519b556: (-s ours) am 10cac527: (-s ours) am 5404ff9e: DO NOT MERGE Version fixes 	modified:   apps/CtsVerifier/AndroidManifest.xml 	modified:   tools/tradefed-host/src/com/android/cts/tradefed/build/CtsBuildProvider.java

* commit '6f6e4a6f':
parents 6dd64ef0 6f6e4a6f
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