merge from open-source master

Change-Id: Ia37601f1c8e38a81bfc82b90a05bd3dae20dac88
This commit is contained in:
The Android Open Source Project 2010-07-19 12:49:39 -07:00
commit 29bff32cc0

Diff Content Not Available