| commit | 675fd084577299e0edd9ca634b930459b0762f5b | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Sep 26 10:07:37 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 26 10:07:37 2012 -0700 |
| tree | 0cf2f809282d776c3c49c5a630da780dab6754a8 | |
| parent | 37a13a9b82c1c0e18d5be3188e8e038f85477459 [diff] | |
| parent | 48f280cf257c8cc27ffef1758dca8834c61fe14a [diff] |
am 48f280cf: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '48f280cf257c8cc27ffef1758dca8834c61fe14a': JOO88 JOO87E JOO87D JOO87C JOO87B JOO87 JOO86B