merge from open-source master

Change-Id: I05e4c26c902f3cfe0dd99107f518768b246562f7
This commit is contained in:
The Android Open Source Project 2010-06-18 12:44:20 -07:00
commit 16df15b777

Diff Content Not Available