tree ecc5532d33a77223430fe0d837aefb961d0ecbbc
parent d2cb2b51af44e35d02b516a245b8931d4c9e4b61
parent afae108e09c13c557beee12440cea6345bff924f
author The Android Open Source Project <initial-contribution@android.com> 1322841419 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1322841419 -0800

am afae108e: Reconcile with ics-mr1-release

* commit 'afae108e09c13c557beee12440cea6345bff924f':