| commit | 7195847fdbe16fbe3ec476b14897ebcd496ae695 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Sat Aug 25 07:21:35 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 25 07:21:35 2012 -0700 |
| tree | 29bb5cb3b5e6178ff9acbaea7eef4c375bda9ff7 | |
| parent | bf28d6746389d34a9010e096cfd07ca92c271ad5 [diff] | |
| parent | 4a10e73f5803bbb6258fe2544157bc23bdff1155 [diff] |
am 4a10e73f: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '4a10e73f5803bbb6258fe2544157bc23bdff1155':