merge from open-source master

Change-Id: Ia4cbea9d94b2ff34fc8ce97c1fe35ca5898d6c1c
This commit is contained in:
The Android Open Source Project 2010-05-10 13:48:37 -07:00
commit 22cffae52d

Diff Content Not Available