am b4ab2204: am 143c3d32: am 5ccb8b8c: merge from open-source master

This commit is contained in:
The Android Open Source Project 2010-05-18 11:21:36 -07:00 committed by Android Git Automerger
commit 237552a0b1

Diff Content Not Available