merge from open-source master

Change-Id: I7a9f23192372fc6973d9f3eb399f895f4765f6b2
This commit is contained in:
The Android Open Source Project 2010-06-14 11:06:33 -07:00
commit f7ac9f5f68

Diff Content Not Available