merge from froyo-plus-aosp

Change-Id: Iec3c2022aaea07b09ff09bcb690331385b30584b
This commit is contained in:
The Android Open Source Project 2010-06-25 09:59:31 -07:00
commit e62384faeb

Diff content is not available