merge from open-source master

Change-Id: Ia0201ec7be4c112569b8775429d1c9674eb3b661
This commit is contained in:
The Android Open Source Project 2010-05-17 08:56:54 -07:00
commit 5a64b6daec

Diff Content Not Available