| commit | 4af77e52fed46798d182b6bf69c6a107a5f85636 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Mar 12 14:20:49 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 12 14:20:49 2013 +0000 |
| tree | 811c31f4c9f730e784f4c508c01de6b572f30274 | |
| parent | 617b474a6bdc8e732b50a3ea744850184410619e [diff] | |
| parent | 31248226a3ad88827cbbf08fd000b57b7db69a07 [diff] |
am 31248226: (-s ours) Reconcile with jb-mr2-release - do not merge * commit '31248226a3ad88827cbbf08fd000b57b7db69a07':