am 673b0fe2: (-s ours) am 15800b79: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '673b0fe2820c9d00874386acc2aed3f9e847641d':
  Import translations. DO NOT MERGE
tree: a78640cdc874eb0ef70529dd892594689c98b886
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml