tree aa8f425291da8dab52909b642f91e2d6c9738e54
parent 243732e3564683b42411a70869bccbbd48b6b1a8
parent 5cb79935b9ebb74a410d78a986391dda6e9f7994
author The Android Open Source Project <initial-contribution@android.com> 1330121687 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1330121687 -0800

am 5cb79935: am 2ddd7b3e: Reconcile with ics-mr1-release

* commit '5cb79935b9ebb74a410d78a986391dda6e9f7994':