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

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