am c3072f3b: (-s ours) am 219d531a: (-s ours) Import translations. DO NOT MERGE

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