merge from open-source master

Change-Id: Ia0dff818a574c8bc79aa79d65fd21bab9f9f6c30
This commit is contained in:
The Android Open Source Project 2010-07-09 15:59:17 -07:00
commit 2196401413

Diff Content Not Available