merge from open-source master

Change-Id: Ia668b322a02e220b74c222dbbcc5b4fdc3c59ab0
This commit is contained in:
The Android Open Source Project 2010-06-11 13:08:02 -07:00
commit 24ad68f215

Diff Content Not Available