am 957d89a0: (-s ours) am 4beffadc: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '957d89a03f811bda7dc0094f97dbb80a467ffb8a':
  Import translations. DO NOT MERGE
tree: 487dfcead331db1d6bd8cf0f341fac4e88505e8a
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags