commit | 3f140994a82bb604eaf5c80d6252b55f394054ef | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed Feb 01 10:01:05 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 01 10:01:05 2012 -0800 |
tree | 280d85e6f25c5f05c743e34ed5eb2e37a8060551 | |
parent | eb4509bf00a5d3be4caaa8f1b6a062a2d0311e9a [diff] | |
parent | 2e1c94436c634c1b4a7ab6a75a98a14f8ddc1077 [diff] |
am 2e1c9443: Reconcile with ics-mr1-release * commit '2e1c94436c634c1b4a7ab6a75a98a14f8ddc1077':