am 4aa14f03: (-s ours) am b5071e4a: (-s ours) am 4802efe1: (-s ours) Import translations. DO NOT MERGE

* commit '4aa14f03551fafee2b87eccbc4dafee04d46a9b8':
  Import translations. DO NOT MERGE
tree: 383bfb90e1940881c4f125f4b595ef1d2ad44e5a
  1. canon/
  2. res/
  3. src/
  4. Android.mk
  5. AndroidManifest.xml