tree 8b5effb8ca3f34d070a8a938f2aaac787ca4e4d6
parent f1cf90d8fd9d01baa90224e1594c38aecf2224ff
parent 8f8d5ad9b4de3cd088c05b1dd2961e7cdc80f778
author The Android Open Source Project <initial-contribution@android.com> 1329415610 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1329415610 -0800

am 8f8d5ad9: Reconcile with ics-mr1-release

* commit '8f8d5ad9b4de3cd088c05b1dd2961e7cdc80f778':