| commit | 140b1b007707d99eacfe137e411e0cd7b2fb7280 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Nov 27 08:26:51 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 27 08:26:51 2012 -0800 |
| tree | f5f158caa46550c9144606d3c5d90bd7b6868528 | |
| parent | 98a937f87e5b0a12f40b7a79751d8a45d094e300 [diff] | |
| parent | d7c097e46451641f99a21638786c5939ca82c557 [diff] |
am d7c097e4: (-s ours) am edbde709: (-s ours) Merge jb-mr1-dev into aosp/master - do not merge * commit 'd7c097e46451641f99a21638786c5939ca82c557': Manually update tradefed prebuilt from jb.