| commit | d8bdb7fc2421df6f8c3214ce3f700f03f0357081 | [log] [tgz] |
|---|---|---|
| author | Guru Nagarajan <gurunagarajan@google.com> | Tue Mar 05 13:09:38 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 05 13:09:38 2013 -0800 |
| tree | dfca3d8959e95208aa4230a06de83035f425d064 | |
| parent | 809466598a9c5dcd1996aa675b48c1434dcf1186 [diff] | |
| parent | 5a5149b494fb04d3a49d4a322d1e42fc0fbab5d7 [diff] |
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/CtsBuildProvider.java * commit '5a5149b494fb04d3a49d4a322d1e42fc0fbab5d7':