am f6ff2be3: Merge change I72749815 into eclair-mr2

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

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