merge from open-source master

Change-Id: I17a51b7cebe1486103d4b0af00e7297ddccb60b8
This commit is contained in:
The Android Open Source Project 2010-06-18 11:36:35 -07:00
commit 2045f4b3c5

Diff Content Not Available