Commit 9519b556 authored by Guru Nagarajan's avatar Guru Nagarajan Committed by Android Git Automerger
Browse files

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

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 '10cac527':
  DO NOT MERGE Version fixes 	modified:   apps/CtsVerifier/AndroidManifest.xml 	modified:   tools/tradefed-host/src/com/android/cts/tradefed/build/CtsBuildProvider.java
parents 030dcef8 10cac527
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