| commit | 159bf04c5bcb688ba08890d8d70151b5e73bb9b0 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Aug 15 08:32:36 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 15 08:32:36 2012 -0700 |
| tree | 9eaddb73e167ee3712f97971d6acfd5254e3440c | |
| parent | 9d763f850a76a7d17c0c809810f902c636fb78f6 [diff] | |
| parent | 964cd9e7f0a4c70dbc31d25e648eb3963c565be9 [diff] |
am 964cd9e7: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '964cd9e7f0a4c70dbc31d25e648eb3963c565be9':