am 0fdf05e9: (-s ours) am 0dffb211: (-s ours) Import translations. DO NOT MERGE

* commit '0fdf05e909b3645983f434847ce652254006da7d':
tree: fbbf1af8b3273ee69e60750c87c447c0c013dd1e
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags