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

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