am 1de953ae: Merge change Ie31311fd into eclair-mr2

Merge commit '1de953aee53db0d3040cf242b20e9340787725c5' into eclair-mr2-plus-aosp

* commit '1de953aee53db0d3040cf242b20e9340787725c5':
  fix the "right icon" in the titlebar