merge from open-source master

Change-Id: I5d19eb677dcfc7b73919d659fafb29fb85dc7f47
This commit is contained in:
The Android Open Source Project 2010-06-14 10:57:53 -07:00
commit 16f60b78d4

Diff Content Not Available