| commit | ef23763648fe8ed334fae9f0d12e3d60627edaac | [log] [tgz] |
|---|---|---|
| author | Guru Nagarajan <gurunagarajan@google.com> | Mon Mar 04 21:43:00 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 04 21:43:00 2013 -0800 |
| tree | dfca3d8959e95208aa4230a06de83035f425d064 | |
| parent | 30d85a7fac2687560ce4be98d3d36eb34626b956 [diff] | |
| parent | 582b789f8479fb12041a3a4e9cd7f0bd362f322d [diff] |
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 '582b789f8479fb12041a3a4e9cd7f0bd362f322d': DO NOT MERGE Version fixes modified: apps/CtsVerifier/AndroidManifest.xml modified: tools/tradefed-host/src/com/android/cts/tradefed/build/CtsBuildProvider.java