| commit | ef5b1852fcfd52f44e9932bd756740e180a31076 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Aug 21 16:10:00 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 21 16:10:00 2012 -0700 |
| tree | 6e4016689dacd7f820868f771404817c62f439f7 | |
| parent | 87c54a51cba784a7d9c39f836e0da150df8302d8 [diff] | |
| parent | 2e6d182e09073fe4ddf1ee38fb831a4e50c9e588 [diff] |
am 2e6d182e: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '2e6d182e09073fe4ddf1ee38fb831a4e50c9e588':