| commit | 54175823267be3f77adde8e082a5c219102a868c | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Aug 10 08:55:50 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 10 08:55:50 2012 -0700 |
| tree | 163b58b794673d018562d414e70a25174e6dbe14 | |
| parent | 7255104266f65a3049a5ad4cf4436b171529fcf5 [diff] | |
| parent | 8928b092b6f4158d77627d3faa6ebce3ca13f412 [diff] |
am 8928b092: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '8928b092b6f4158d77627d3faa6ebce3ca13f412':