| commit | 40b95c1e10a7e7bb06efe24532ca235839341c2c | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Aug 27 15:20:28 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 27 15:20:28 2012 -0700 |
| tree | 942e4afded8f3fa9beae08f4c44439715dfe1da4 | |
| parent | 3c1527ecc7c0506d3f41b8b3d2ad6e7d48009701 [diff] | |
| parent | 7e7c1a071f994e6ae5e3e45db2c014927676ee46 [diff] |
am 7e7c1a07: (-s ours) am c1c571ec: am 28f37bb9: (-s ours) Reconcile with jb-mr0-release jb-release - do not merge * commit '7e7c1a071f994e6ae5e3e45db2c014927676ee46': JRO03U JRO03T JZO54