tree 1690c903f08dd3cb7c575e2ba0974f0cd6be3bd9
parent 5d6a9cad5dbf929a52e3ab9bdb5cb1b4f3a69c95
parent 0cc3f31e1eeb13c64400941cae6541373c9e2605
author The Android Open Source Project <initial-contribution@android.com> 1328119576 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1328119576 -0800

am 0cc3f31e: am 804865e7: Reconcile with ics-mr1-release

* commit '0cc3f31e1eeb13c64400941cae6541373c9e2605':