am be2b6c3e: (-s ours) am ef964985: (-s ours) am 529b37ea: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit 'be2b6c3e88a16a6b1a46b64bd480f70be3de9730':
  Import translations. DO NOT MERGE
tree: 8d5bf7e2e9743e7f5c18415b4a9f37dd330b210e
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags