| commit | 2e11b0f07861c41af10b23c477cc6e89fac709ba | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Aug 16 18:59:13 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 16 18:59:13 2012 -0700 |
| tree | 7aab8d9aeca7b05eef4332995344a3d64ecf3fc9 | |
| parent | 88ed4fb1f3456d6fec4df87a56d66a5c58e2f0d8 [diff] | |
| parent | 36bec56c303ff250ba8c571c837531f82411839e [diff] |
am 36bec56c: am dfab95a1: (-s ours) Reconcile with jb-mr0-release jb-release - do not merge * commit '36bec56c303ff250ba8c571c837531f82411839e': JRO03R JZO47 JRO03Q