am 0df0a2a2: merge from froyo-plus-aosp

Merge commit '0df0a2a20a4e1418983126e72af0e62ebc0cc8f3'

* commit '0df0a2a20a4e1418983126e72af0e62ebc0cc8f3':