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