commit | 83b9613395305653290f4236989fc60313ec93ac | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri Jan 06 18:18:42 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jan 06 18:18:42 2012 -0800 |
tree | c063359cd8a8484cf81f256c6db672e7b6aa6a25 | |
parent | 38d658d01d357878f3eb8201a31c1f120351e605 [diff] | |
parent | 5be1b1a29507fe0aa09c30403b989a36077de0a7 [diff] |
am 5be1b1a2: Reconcile with ics-mr1-release * commit '5be1b1a29507fe0aa09c30403b989a36077de0a7':