tree f6b00c67761e75697851f8f86e37b46da80859cd
parent 959fd880eaabcbc2b1fd586e9eb26494eb6b19b1
parent fcf2f4b17338501d8498a2a16eb832445b293e8f
author The Android Open Source Project <initial-contribution@android.com> 1332346144 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1332346144 -0700

am fcf2f4b1: am 98e1b541: Reconcile with ics-mr1-release

* commit 'fcf2f4b17338501d8498a2a16eb832445b293e8f':