am dca7c008: merge from froyo-plus-aosp

Merge commit 'dca7c0080e82fd7a29e6eebbba507122d73a9d32'

* commit 'dca7c0080e82fd7a29e6eebbba507122d73a9d32':