am 374b6837: (-s ours) am f69a3ab7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev

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