am bb6eb408: merge from froyo-plus-aosp
This commit is contained in:
committed by
Android Git Automerger
commit
1bd697c32b