am 61fe1fc7: (-s ours) am cf859e0f: (-s ours) am ff644e0c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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