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

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