am c9b8f140: (-s ours) am 35156fc2: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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