merge from open-source master

Change-Id: I34e8339dcf1bf658703d0d2f9656ceb66594af22
This commit is contained in:
The Android Open Source Project
2010-05-19 08:15:54 -07:00

Diff Content Not Available