merge from open-source master

Change-Id: I6bdeeff30be1fdb0901aec9bcdd67176c29eaf7b
This commit is contained in:
The Android Open Source Project 2010-07-16 13:58:43 -07:00
commit 3923714fcb

Diff Content Not Available