| commit | 23717baba1ef92e1dfabf1cd005ea26787a18e33 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Oct 15 07:40:17 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 15 07:40:17 2012 -0700 |
| tree | 21c503d206735c3381862977eaf6a6d195dd6d18 | |
| parent | 0067cc7ac71701c12f16663100d4a557dd50a0d4 [diff] | |
| parent | 165c67aacd8c6e8e6ffe57e673602952e4b56219 [diff] |
am 165c67aa: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit '165c67aacd8c6e8e6ffe57e673602952e4b56219': JOP15 JOP14 JOP13 JOP12D JVP12C JOP12C JOP12B JVP12 JOP12 JOP11B JVP11