tree 243858ea368ebb5ab6ac7e85cb868734b8bb58e3
parent 466d009d320354ea0e8b90703602dfb9d5da187f
parent 81304325161a14e9f9908def807114b33b13dce6
author The Android Open Source Project <initial-contribution@android.com> 1323732600 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1323732600 -0800

am 81304325: Reconcile with ics-mr1-release

* commit '81304325161a14e9f9908def807114b33b13dce6':