am 6e9c3763: (-s ours) am 3e9fac90: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev

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