am 62f30537: am c0b3ad16: merge from open-source master

This commit is contained in:
The Android Open Source Project 2010-06-02 08:11:57 -07:00 committed by Android Git Automerger
commit a48c07008e

Diff Content Not Available