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

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