merge from open-source master

Change-Id: If7ae0c5629d1b3c540cacfa517425c2e6b5822d1
This commit is contained in:
The Android Open Source Project 2010-06-18 12:46:16 -07:00
commit 5292755e6e

Diff Content Not Available