am e70f4e74: merge from froyo-plus-aosp

This commit is contained in:
Jean-Baptiste Queru 2010-06-09 16:24:15 -07:00 committed by Android Git Automerger
commit 65bca31122

Diff Content Not Available