am f625246b: (-s ours) am fcc395b3: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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