merge from froyo-plus-aosp

Change-Id: I5c020c7dd4e9b0629254ff027f11af484d47ba8c
This commit is contained in:
The Android Open Source Project 2010-06-14 11:44:20 -07:00
commit 7a9b65fc13

Diff Content Not Available