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

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