| commit | 5a5149b494fb04d3a49d4a322d1e42fc0fbab5d7 | [log] [tgz] |
|---|---|---|
| author | Guru Nagarajan <gurunagarajan@google.com> | Tue Mar 05 13:02:37 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 05 13:02:37 2013 -0800 |
| tree | 01cac341e28f9264abf9d4e89a318abcac6b9d72 | |
| parent | 6dd64ef0857d012999dfdd8f3e6b38f0d8910987 [diff] | |
| parent | 6f6e4a6f243afdcb3576e20913eb2caed77a5e02 [diff] |
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 '6f6e4a6f243afdcb3576e20913eb2caed77a5e02':