| commit | 8f4b2e12b8fdddb5501a1064db59efd815e594dd | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Jan 20 15:52:28 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jan 20 15:52:28 2012 -0800 |
| tree | 47c92871b36c4444d8584a7a7be3909d805311ed | |
| parent | 22769993a1e8511af84c49161c0f032475023a48 [diff] | |
| parent | 1a0475acc38b378e7beec69817c0f3fec045c93b [diff] |
am 1a0475ac: Reconcile with ics-mr1-release * commit '1a0475acc38b378e7beec69817c0f3fec045c93b':