merge from open-source master

Change-Id: I4d7b0ec9895d8b090e0cdf2efb6731358a5d087c
This commit is contained in:
The Android Open Source Project 2010-06-15 09:32:37 -07:00
commit 734a19df4e

Diff Content Not Available