am 94ee9260: am 3b36ed09: Merge change I95319bde into eclair

Merge commit '94ee92600a13f4d58afa61215c69fb60b989f6f3' into eclair-mr2-plus-aosp

* commit '94ee92600a13f4d58afa61215c69fb60b989f6f3':