am c8cb253d: (-s ours) am 234114ea: (-s ours) Import translations. DO NOT MERGE

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