merge from froyo-plus-aosp

Change-Id: I85cd0e3207b09b81e41f15d85cd1c900a6bb56b3
This commit is contained in:
The Android Open Source Project 2010-06-21 10:56:43 -07:00
commit cda7578b46

Diff content is not available