am 11cef1d8: (-s ours) am fa584b69: (-s ours) Import translations. DO NOT MERGE

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