| commit | 74f8cab3959f9e7d65d2efecf86aef44a18f7d6b | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Aug 07 11:04:09 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 07 11:04:09 2012 -0700 |
| tree | 8efc539d1247e764b9864a7519c21c251190b9af | |
| parent | 7f49fcccca864b7076ad3c6ce05d5c725edc46ad [diff] | |
| parent | 84d8513a5c45fbafce3a2da3a51a438420cea85d [diff] |
am 84d8513a: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '84d8513a5c45fbafce3a2da3a51a438420cea85d': JOO38