am e62384fa: merge from froyo-plus-aosp

Merge commit 'e62384faeb5652761bd22edc8c1049c7cbc2aba8'

* commit 'e62384faeb5652761bd22edc8c1049c7cbc2aba8':