am dc76d696: am 9e2562b8: Merge change I88c6e267 into eclair

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

* commit 'dc76d6966c6bcbe11262802fad2663b8744d241d':