merge from open-source master

Change-Id: I84a8efc2d58476c72e84170c19dc692dc180b97d
This commit is contained in:
The Android Open Source Project 2010-07-19 09:04:02 -07:00
commit cc0820bfcd

Diff Content Not Available