| commit | 6e765cff05e7ba6d0dd81589102a75b728124c17 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Aug 22 15:37:15 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 22 15:37:15 2012 -0700 |
| tree | c855c5d85cd6a6b943b369af6781a123c51b0ab3 | |
| parent | 3ea0a81c2bf2ad806a21c1df390751a4b68ebee1 [diff] | |
| parent | 5b82523d357ffbd542a7274601d2cece380a7e54 [diff] |
am 5b82523d: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '5b82523d357ffbd542a7274601d2cece380a7e54': JOO53B JOO53