am e62384fa: merge from froyo-plus-aosp

Merge commit 'e62384faeb5652761bd22edc8c1049c7cbc2aba8'

* commit 'e62384faeb5652761bd22edc8c1049c7cbc2aba8':
This commit is contained in:
The Android Open Source Project 2010-06-25 14:21:25 -07:00 committed by Android Git Automerger
commit 74f20f4054

Diff content is not available