am cda7578b: merge from froyo-plus-aosp

Merge commit 'cda7578b46fff7720a234397d267f0a4876a41f4'

* commit 'cda7578b46fff7720a234397d267f0a4876a41f4':
This commit is contained in:
The Android Open Source Project 2010-06-21 10:58:55 -07:00 committed by Android Git Automerger
commit 88061c6014

Diff content is not available