commit | 4adcb1737a9186e3e2c4d241e6238eb1700afdeb | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Tue Dec 20 13:09:54 2011 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 20 13:09:54 2011 -0800 |
tree | fcf4b5ac422b2286f0bc743ae55012abf7917254 | |
parent | 90aa84921b3808bace23c55f122723965325fa88 [diff] | |
parent | bc1de01fe96daaad2573f04faa7e499b24da760f [diff] |
am bc1de01f: Reconcile with ics-mr1-release * commit 'bc1de01fe96daaad2573f04faa7e499b24da760f':