| commit | 952bde2d751f3425ba5af407731cd516a1998a4e | [log] [tgz] |
|---|---|---|
| author | Guru Nagarajan <gurunagarajan@google.com> | Tue Mar 05 05:49:50 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 05 05:49:50 2013 +0000 |
| tree | 96a3383c4904fd7a226cad2942a41019fd2a5976 | |
| parent | df789a338c002e8036230aaa0a2f92db66e5d8d3 [diff] | |
| parent | ef23763648fe8ed334fae9f0d12e3d60627edaac [diff] |
am ef237636: am 582b789f: 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 'ef23763648fe8ed334fae9f0d12e3d60627edaac': DO NOT MERGE Version fixes modified: apps/CtsVerifier/AndroidManifest.xml modified: tools/tradefed-host/src/com/android/cts/tradefed/build/CtsBuildProvider.java