| commit | d3ccfd53fe5c0bb4138b22acb818d567a4ca2466 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Oct 02 14:51:18 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 02 14:51:18 2012 -0700 |
| tree | 50277a407a947a09980d6fb497dc5b27b88597e2 | |
| parent | 9acbbf1267fc43bac61320a36dbf92edd00a357a [diff] | |
| parent | 5759deadaad0b1055a703b11ed6509b8e46a0140 [diff] |
am 5759dead: am a6c77d92: (-s ours) Reconcile with jb-mr0-release jb-release - do not merge * commit '5759deadaad0b1055a703b11ed6509b8e46a0140': JZO54K JRO03X