tree ce0a445410a31b4de124a9166cbbe41e5ac95b67
parent f697057f4209f66da91afb1cfdcf39d53e82f6a2
parent c3307f7b61ae37aa26a05b37604a04c9c2e47f19
author The Android Open Source Project <initial-contribution@android.com> 1328119580 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1328119580 -0800

am c3307f7b: am 230d4c23: Reconcile with ics-mr1-release

* commit 'c3307f7b61ae37aa26a05b37604a04c9c2e47f19':