tree 7c2dd6d73e4d7471293ecc85d59b7c35290d6cf8
parent 580b1e46cd4d78220bbf17f2d5eaa94991fd220d
parent ec6745d7b8d42d6687bcf54ccf430ad32f2a6bb6
author The Android Open Source Project <initial-contribution@android.com> 1328116153 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1328116153 -0800

am ec6745d7: Reconcile with ics-mr1-release

* commit 'ec6745d7b8d42d6687bcf54ccf430ad32f2a6bb6':