am 971ca440: (-s ours) am d2eab38a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '971ca440abad05e96df96e8f30c8a262f5be6f31':
  Import translations. DO NOT MERGE
tree: 11f8597dadc9175f13573e99c1c2e461a7af3235
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags