am 2b3bbcfb: (-s ours) am 1fb10e00: (-s ours) Import translations. DO NOT MERGE

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