merge from open-source master

Change-Id: Ica77cebdbb8880345faeb1ee819f51b0b7ff7a0c
This commit is contained in:
The Android Open Source Project 2010-06-14 11:07:32 -07:00
commit 5c4c784bd7

Diff Content Not Available