| commit | ad0c2e5df9980f834b658c7c72630a8cde3ac991 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Dec 12 07:45:29 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Dec 12 07:45:29 2012 -0800 |
| tree | f1c42e711c86009f867207894a11a596f70e8095 | |
| parent | 4c52d70152af83a625f542b2433a0f47947b0eec [diff] | |
| parent | cbc0968f602c15692200c827fe78944d1f528654 [diff] |
am cbc0968f: (-s ours) am b3e8a615: am 16cb8655: Reconcile with jb-mr1-release - do not merge * commit 'cbc0968f602c15692200c827fe78944d1f528654': JOP40F