am aa218eeb: am e3a87e1f: (-s ours) am d9f2cf37: (-s ours) Import revised translations.  DO NOT MERGE

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

* commit 'aa218eebc64fa3fbe70c01ef70adfead6d7c282c':