merge from open-source master

Change-Id: I8e7ccd470e8b90347686985aa2d8337d0c38900c
This commit is contained in:
The Android Open Source Project 2010-06-18 12:40:42 -07:00
commit de3f19a220

Diff Content Not Available