commit | 0a1c57151eba7ec17c38a417ba2351996576ce0c | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Mon Jan 30 13:38:50 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jan 30 13:38:50 2012 -0800 |
tree | 18d2f72922c501472648310c65a868f55e0e2418 | |
parent | 0fe24c96be69e0fd03cbaf16f1b0070423d98799 [diff] | |
parent | aee9fc1e4a44004a2d0b76dcf4f33cb544d29189 [diff] |
am aee9fc1e: Reconcile with ics-mr1-release * commit 'aee9fc1e4a44004a2d0b76dcf4f33cb544d29189':