merge from open-source master

Change-Id: I526915e374c6a6c34503f2b289b7b76ccceccbeb
This commit is contained in:
The Android Open Source Project 2010-07-16 13:47:19 -07:00
commit 189f3d790d

Diff Content Not Available