am aca29235: am d12ba5e0: (-s ours) Merge change Ibd5b099c into eclair

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

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