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