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

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