am a43bc500: (-s ours) am 3d2ecd14: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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