tree 7883542bcc1e3b1dab376b950497a5796b51addd
parent cc77ff73c64c945705158b374209d7d69c433d16
parent b90cb1d20c7d5701e073bf5293a64bfa57861782
author The Android Open Source Project <initial-contribution@android.com> 1321465055 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1321465055 -0800

am b90cb1d2: am c6023243: Reconcile with ics-factoryrom-2-release

* commit 'b90cb1d20c7d5701e073bf5293a64bfa57861782':