am 102d0ab0: merge from froyo-plus-aosp

Merge commit '102d0ab071af04c81ede8155205a6231b99b140c'

* commit '102d0ab071af04c81ede8155205a6231b99b140c':