tree fdbc6ed8c20327ecae287d12b573648bd9506ecd
parent 57a966e444e939997ca0dac079e38cae530f3385
parent e93b5221c0f201345ee78f0fbd94c36f4fb00490
author The Android Open Source Project <initial-contribution@android.com> 1329415603 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1329415603 -0800

am e93b5221: Reconcile with ics-mr1-release

* commit 'e93b5221c0f201345ee78f0fbd94c36f4fb00490':