am 01c69bd3: (-s ours) am ccfbdf7f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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