am 9387ca53: (-s ours) am bbc9e48d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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