| commit | cb4a1e65ff9e416d5a6a56628cc8732aa5066761 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Jul 31 14:52:54 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 31 14:52:54 2012 -0700 |
| tree | bebef3e8b8d9ef0842d6591508d78f58300dd5bb | |
| parent | abb3d697c872dbc29ce5cfa376369e724c7e362c [diff] | |
| parent | 8a7d620aa0ad7bada6f50b757d1bc328db1fe257 [diff] |
am 8a7d620a: am 4124016a: (-s ours) Reconcile with jb-mr0-release - do not merge * commit '8a7d620aa0ad7bada6f50b757d1bc328db1fe257':