am e9d8f545: am 6903d5ce: Merge change Iee649a81 into eclair

Merge commit 'e9d8f545bf0ae577733c6aefc0f7cb671f61af5e' into eclair-mr2-plus-aosp

* commit 'e9d8f545bf0ae577733c6aefc0f7cb671f61af5e':