| commit | 049a78828418c9581b2926a41633dd1b441b2ee8 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Mar 21 08:26:53 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Mar 21 08:26:53 2012 -0700 |
| tree | 8cb6a80766b6214ba47bcb89c74869d7b2918781 | |
| parent | 0fc8abe1f661e341ea3c7112d5311f72482e2c16 [diff] | |
| parent | 3ebb3dad6e8da55b2057d064c2c0275f478b4f61 [diff] |
am 3ebb3dad: Reconcile with ics-mr1-release * commit '3ebb3dad6e8da55b2057d064c2c0275f478b4f61':