merge from froyo-plus-aosp

Change-Id: I0b5605e2b1c31593dc31abd62e275d0602db46eb
This commit is contained in:
The Android Open Source Project 2010-06-25 11:23:56 -07:00
commit 9af4e06e36

Diff Content Not Available