am d8cd33b4: (-s ours) am 5173e266: (-s ours) Import translations. DO NOT MERGE

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