am e30059fd: am fbb9146f: (-s ours) Merge change I452e3a4c into eclair

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

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