tree 6a66928ba0f67289546e1f12b28b49b6913e7ef4
parent b10c364f5d2885a4654efacb8d945ede4be40847
parent 9a224ab7813c16f862a742a7e9653f92b4f5999c
author The Android Open Source Project <initial-contribution@android.com> 1329420320 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1329420320 -0800

am 9a224ab7: am 5927015b: Reconcile with ics-mr1-release

* commit '9a224ab7813c16f862a742a7e9653f92b4f5999c':