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