tree 6a66928ba0f67289546e1f12b28b49b6913e7ef4
parent 8ddbecfbcce9a2ac46bb82249b151d027f0dcd42
parent 394b57e4cc6fb93ef7238da8002d3aa0d1dcac3f
author The Android Open Source Project <initial-contribution@android.com> 1328119572 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1328119572 -0800

am 394b57e4: am aae29932: Reconcile with ics-mr1-release

* commit '394b57e4cc6fb93ef7238da8002d3aa0d1dcac3f':