merge from open-source froyo

Change-Id: I947332f4e978326309fe14d01875ebfe94405c9f
This commit is contained in:
The Android Open Source Project 2010-07-28 11:24:38 -07:00
commit 3a0576a418

Diff Content Not Available