am 70271e3b: am 2cb6b7fb: (-s ours) Merge change Ic4bf942c into eclair

Merge commit '70271e3bbda03225a64ff70c833d97829fc0ac1c' into eclair-mr2-plus-aosp

* commit '70271e3bbda03225a64ff70c833d97829fc0ac1c':
  Import revised translations.  DO NOT MERGE