am 6979f4ca: (-s ours) Merge "Import translations. DO NOT MERGE"

* commit '6979f4ca1ec9d953581763d919bede2dc5a33346':
  Import translations. DO NOT MERGE
tree: 435ef0fe5076eb1fad21c2c61931288a9277df4c
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags