am f9034037: (-s ours) am 8c91efc5: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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