commit | 9519b556bd8fe4a14e6bab0c03c2ad60de7a6a46 | [log] [tgz] |
---|---|---|
author | Guru Nagarajan <gurunagarajan@google.com> | Mon Mar 04 12:14:07 2013 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 04 12:14:07 2013 -0800 |
tree | 87eb36e47aa38a1b6a119c8e47377e6b26df787d | |
parent | 030dcef8900da310fbfa94cb0d2d4c5377a54244 [diff] | |
parent | 10cac527706816cfd65594076b60e3133a2faad1 [diff] |
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