merge from froyo-plus-aosp

Change-Id: I9bd45d66c9586b99635d7d05d1f351126bfc9840
This commit is contained in:
The Android Open Source Project 2010-06-25 11:21:37 -07:00
commit 6c9227d821

Diff Content Not Available