am 048d6446: (-s ours) am e7aee4b3: (-s ours) Import translations. DO NOT MERGE

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