am 2c63c367: (-s ours) am d58e82b4: (-s ours) Import translations. DO NOT MERGE

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