am afca60dd: am 59c82376: am c8763858: merge from open-source master

This commit is contained in:
The Android Open Source Project 2010-06-02 08:58:37 -07:00 committed by Android Git Automerger
commit aad8fd541f

Diff Content Not Available