merge from open-source master

Change-Id: Ib9ec3f3b7418d064b643577156d7d16688b3048d
This commit is contained in:
The Android Open Source Project 2010-06-15 11:44:09 -07:00
commit 70dcdfd240

Diff Content Not Available