| commit | 582b789f8479fb12041a3a4e9cd7f0bd362f322d | [log] [tgz] |
|---|---|---|
| author | Guru Nagarajan <gurunagarajan@google.com> | Mon Mar 04 12:58:38 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 04 12:58:38 2013 -0800 |
| tree | 01cac341e28f9264abf9d4e89a318abcac6b9d72 | |
| parent | 97448d21536f2058fccc060db5583be29ac0a55c [diff] | |
| parent | 9519b556bd8fe4a14e6bab0c03c2ad60de7a6a46 [diff] |
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 '9519b556bd8fe4a14e6bab0c03c2ad60de7a6a46': DO NOT MERGE Version fixes modified: apps/CtsVerifier/AndroidManifest.xml modified: tools/tradefed-host/src/com/android/cts/tradefed/build/CtsBuildProvider.java