merge from froyo-plus-aosp

Change-Id: Ic1d0535cb746af0c53a5277b008061f7a2d973a2
This commit is contained in:
The Android Open Source Project 2010-06-25 11:20:45 -07:00
commit cd00884e32

Diff Content Not Available