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

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