merge from froyo-plus-aosp

Change-Id: Ibaa84571e3b5a7ea29e55d41f773aa5f301086de
This commit is contained in:
The Android Open Source Project 2010-06-25 11:18:59 -07:00
commit 41e3845b5d

Diff Content Not Available