am 214dbb45: Fix bug2123514 and a handful of other string edits.

Merge commit '214dbb45a93996a8cbc697864f5fe55a5447abca' into eclair-plus-aosp

* commit '214dbb45a93996a8cbc697864f5fe55a5447abca':
  Fix bug2123514 and a handful of other string edits.