tree 5c2420bbf957b6d4d0ce34d7d6a6a812eff67f73
parent 7a284f20d30176317d4712119832508e72f09d37
parent 6b1dade9c64196afc357d2843528b5efc826a262
author The Android Open Source Project <initial-contribution@android.com> 1330121494 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1330121494 -0800

am 6b1dade9: am d58f3d2b: Reconcile with ics-mr1-release

* commit '6b1dade9c64196afc357d2843528b5efc826a262':