merge from open-source master

Change-Id: I1a36964a723bce72139f1bc2402520b7f8d5e47b
This commit is contained in:
The Android Open Source Project 2010-06-07 16:37:22 -07:00
commit 33f7b83776

Diff Content Not Available