merge from froyo-plus-aosp

Change-Id: I64de22c97a98ec4f1f288c619e3d66d6be261c6d
This commit is contained in:
The Android Open Source Project 2010-06-21 10:52:43 -07:00
commit 04acf6c80e

Diff Content Not Available