| commit | 768ebe51f4490cd8a84a42b13f84ba5e6a366d11 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Jul 31 14:51:16 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 31 14:51:16 2012 -0700 |
| tree | cd14ec94f2dc16feac7aa5cf7546dfe45a72a33b | |
| parent | d52c63b09cb50d97ca24e0ffcf6d9d031aa9f48f [diff] | |
| parent | 2a5f755a794b2ce4d4027804bcb1af6ece714933 [diff] |
am 2a5f755a: am 8665eb73: (-s ours) Reconcile with jb-mr0-release jb-release - do not merge * commit '2a5f755a794b2ce4d4027804bcb1af6ece714933': JZO31 JRO03N JRO03M