merge from open-source master

Change-Id: Ie1dc11ee5c184b8f355ca8e2c1a74f86aea4c299
This commit is contained in:
The Android Open Source Project 2010-06-08 15:27:25 -07:00
commit 36d25509da

Diff Content Not Available