| commit | 4c52d70152af83a625f542b2433a0f47947b0eec | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Dec 12 07:36:23 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Dec 12 07:36:23 2012 -0800 |
| tree | f1c42e711c86009f867207894a11a596f70e8095 | |
| parent | 02d29216c92272fe2c3839a835c5a2c1ea6268f2 [diff] | |
| parent | c9b993620b5648dac65804cb6a314aad1d58432d [diff] |
am c9b99362: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit 'c9b993620b5648dac65804cb6a314aad1d58432d': JDP72B JDP72