am bb6eb408: merge from froyo-plus-aosp

This commit is contained in:
Jean-Baptiste Queru
2010-06-09 16:03:33 -07:00
committed by Android Git Automerger

Diff Content Not Available