merge from open-source master

Change-Id: I381f1faaa26a7e52e9882976f32f703fc2aa9c75
This commit is contained in:
The Android Open Source Project 2010-06-14 14:28:18 -07:00
commit 9bc88eed9d

Diff Content Not Available