tree 57f92356a7abc86583d8c72b725c34251c7839ab
parent 7a0ff6d3989770f78ed24c9a840ade3b61abc918
parent afe8c548e5d6cbd132498816002c1c01dd45a0f5
author The Android Open Source Project <initial-contribution@android.com> 1322004763 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1322004763 -0800

am afe8c548: am d49a56ce: am 1889bb49: Reconcile with ics-mr0-release

* commit 'afe8c548e5d6cbd132498816002c1c01dd45a0f5':