tree 0478a79b38309256c4d16d9664c89d1aedb1117d
parent 374011a72ef62b2381235f07fb9117fbb03f12c7
parent 917895384fb7c9fb9ca858fdf792ec165e151de9
author The Android Open Source Project <initial-contribution@android.com> 1323368833 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1323368833 -0800

am 91789538: Reconcile with ics-mr0-release

* commit '917895384fb7c9fb9ca858fdf792ec165e151de9':