| commit | 34ac8bd7ce7dad6e7a01855a27a96bd363df1d2d | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Oct 09 07:29:49 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 09 07:29:49 2012 -0700 |
| tree | 1540d1672e07929c39f0c68fdc9a369dc747a0a2 | |
| parent | 1a7b450c825c44a9014c7848256005fb02627698 [diff] | |
| parent | 65809f42fa47cf7a37b71fe9174ea7960c9a816a [diff] |
am 65809f42: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '65809f42fa47cf7a37b71fe9174ea7960c9a816a': JOP09 JOP08B JOP08 JOP07D JOP07C JOP07B JOP07 JOP05E JOP05D JOP05C JOP05B