commit | 580b1e46cd4d78220bbf17f2d5eaa94991fd220d | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Mon Jan 30 13:38:43 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jan 30 13:38:43 2012 -0800 |
tree | 7c2dd6d73e4d7471293ecc85d59b7c35290d6cf8 | |
parent | 847b3821aad757b63ec3c9499a74ce12b70cf814 [diff] | |
parent | 96d1498016bea5baf3eff8d46ce09df444511430 [diff] |
am 96d14980: Reconcile with ics-mr1-release * commit '96d1498016bea5baf3eff8d46ce09df444511430':