am 9e69418c: (-s ours) Import revised translations.  DO NOT MERGE

Merge commit '9e69418c739d0bafa558119a63a6c07ff3bb7480'

* commit '9e69418c739d0bafa558119a63a6c07ff3bb7480':
  Import revised translations.  DO NOT MERGE
tree: 32b99fd69815fada43942c1faa183a992c45b187
  1. canon/
  2. res/
  3. src/
  4. tests/
  5. Android.mk
  6. AndroidManifest.xml