| commit | 4383fc58423d8a51d97be51774dab703c1d59e3e | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Aug 01 15:15:44 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 01 15:15:44 2012 -0700 |
| tree | cb0bc09c02ededfbe82a3183266f80964645dcac | |
| parent | 26b952db1f54475043f5973b2c1a11379b028922 [diff] | |
| parent | eaa83bbd9ff40ff428ef0c6f5eea1f0ddf8a7ff4 [diff] |
am eaa83bbd: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'eaa83bbd9ff40ff428ef0c6f5eea1f0ddf8a7ff4': JOO32