| commit | 234a16affc593fc1ceb39161f5af21acab3482e9 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Sep 26 09:02:14 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 26 09:02:14 2012 -0700 |
| tree | c2e98ffe144c5f5169864118b245b5353fe21cd5 | |
| parent | 1334db4fe702bd2b71ef14fbc600328ad14bb6a8 [diff] | |
| parent | 96b17f8e9972cb69e2ae8ce9cb137ecc6ca7763a [diff] |
am 96b17f8e: (-s ours) am a8a731bf: (-s ours) Reconcile with jb-mr0-release - do not merge * commit '96b17f8e9972cb69e2ae8ce9cb137ecc6ca7763a': JZO54I