| commit | 9f80e70136128219ac18523e569544547838b4f7 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Aug 16 19:01:25 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 16 19:01:25 2012 -0700 |
| tree | 0dd1cbfba141a98e3a0e198f976a352dec027326 | |
| parent | f8c70844c9d6fc9ac6f9d69b44e4cfd4d6b48122 [diff] | |
| parent | 6d9466445b18c90f0b8129abbd5847a57ceb89a0 [diff] |
am 6d946644: (-s ours) am c61729cf: am b564d4dc: (-s ours) Reconcile with jb-mr0-release - do not merge * commit '6d9466445b18c90f0b8129abbd5847a57ceb89a0':