merge from froyo-plus-aosp

Change-Id: If225e788b2d144dcba63bac818d27892a599eb82
This commit is contained in:
The Android Open Source Project 2010-06-21 11:20:02 -07:00
commit 8b637b9eab

Diff Content Not Available