| commit | efdfb7d8933484d83e4401ad6b1b2eae8d8af46d | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu May 23 08:10:22 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 23 08:10:22 2013 -0700 |
| tree | 62c47f85867794d2ca69dca0c4b7ce4bdd6ff0b8 | |
| parent | 6901768e3622049047e272f53a55263f238d9063 [diff] | |
| parent | 5d8d181494dd13f3f9f91102e32542c099626291 [diff] |
am 5d8d1814: (-s ours) Reconcile with jb-mr2-release - do not merge * commit '5d8d181494dd13f3f9f91102e32542c099626291': "JWR53" JWR52B