commit | 0a63c4c2af49ef149058253e164b4ea2bcd3ffef | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Thu Jan 05 12:08:36 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 05 12:08:36 2012 -0800 |
tree | fac8287208e4de3b49d525358168a2e8f6029073 | |
parent | 112bc5e57e206ec3e0bc5a335b62eae2eb8892e8 [diff] | |
parent | 5225c6fb52c1628f8bd014c3c9a0c2b87f192dab [diff] |
am 5225c6fb: Reconcile with ics-mr1-release * commit '5225c6fb52c1628f8bd014c3c9a0c2b87f192dab':