merge from open-source master

Change-Id: Iaf90d2aaa3cb3a435336c2ccd08b587d9fc3690b
This commit is contained in:
The Android Open Source Project 2010-06-09 12:14:58 -07:00
commit 0887ab4d10

Diff Content Not Available