merge from open-source master

Change-Id: Id6ea4cd9546236ead0c181be82643256525f70b3
This commit is contained in:
The Android Open Source Project 2010-07-09 15:56:45 -07:00
commit 3ab3e72b1c

Diff Content Not Available