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

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