am 50391c0e: (-s ours) am 3da05cbf: (-s ours) am 0c7b1b05: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

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