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