Commit 582b789f authored by Guru Nagarajan's avatar Guru Nagarajan Committed by Android Git Automerger
Browse files

am 9519b556: am 10cac527: (-s ours) am 5404ff9e: DO NOT MERGE Version fixes... 

am 9519b556: 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 '9519b556':
  DO NOT MERGE Version fixes 	modified:   apps/CtsVerifier/AndroidManifest.xml 	modified:   tools/tradefed-host/src/com/android/cts/tradefed/build/CtsBuildProvider.java
parents 97448d21 9519b556
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