tree 880333014d77c5b739b8e6fa823c4177d5380e5d
parent 74a6279eb43d10527b15149311058d6b7af0fac8
parent 62947db579fa7acc9ee01d71f3aeb30add3df260
author The Android Open Source Project <initial-contribution@android.com> 1328119393 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1328119393 -0800

am 62947db5: am 37d0f260: Reconcile with ics-mr1-release

* commit '62947db579fa7acc9ee01d71f3aeb30add3df260':