am f3e11426: am eaa01f68: (-s ours) Merge change I46fb1c7f into eclair

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

* commit 'f3e114265bc3fe843330eeb31a6c6c7364e9bf31':
  Import revised translations.  DO NOT MERGE