| commit | 6588d28ed37af3684fd7dbf8afc1c97273024771 | [log] [tgz] |
|---|---|---|
| author | Guru Nagarajan <gurunagarajan@google.com> | Tue Mar 05 21:12:37 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 05 21:12:37 2013 +0000 |
| tree | c34a0d4fb915baa2c27fded63398f68bc6a7aeab | |
| parent | 02f5616c3f706629519a52fde5ca32cc13f86846 [diff] | |
| parent | d8bdb7fc2421df6f8c3214ce3f700f03f0357081 [diff] |
am d8bdb7fc: am 5a5149b4: am 6f6e4a6f: (-s ours) am 9519b556: (-s ours) 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/CtsBuildProvide * commit 'd8bdb7fc2421df6f8c3214ce3f700f03f0357081':