merge from open-source master

Change-Id: Ide1539b6777faf232d5360d6dc89a5d255982747
This commit is contained in:
The Android Open Source Project 2010-07-21 08:07:26 -07:00
commit 154ad59ade

Diff Content Not Available