merge from froyo-plus-aosp

Change-Id: I297edc39b1076522bb50ffa67e5ee02c3bf0a40c
main
The Android Open Source Project 2010-06-14 11:56:30 -07:00
commit dca7c0080e

Diff Content Not Available