| commit | 59e8eca2a42a35ff5b4d0874355656fa8db5d6ca | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Jul 31 14:55:13 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 31 14:55:13 2012 -0700 |
| tree | 50e18099a6e5cf9562f535de599d9b0e8316db66 | |
| parent | a476f87a5de49dc3a425fd0f4fe115d30a478d95 [diff] | |
| parent | 963a513ae15ebf9c7abcce70cc8d52703841b6e5 [diff] |
am 963a513a: (-s ours) am dccf2260: (-s ours) Reconcile with jb-mr0-release - do not merge * commit '963a513ae15ebf9c7abcce70cc8d52703841b6e5':