am f8728f51: (-s ours) am 22509982: (-s ours) Import translations. DO NOT MERGE

* commit 'f8728f516d79400326f130eb81a682320a863ce8':
  Import translations. DO NOT MERGE
tree: bdd90358dbcc831782b01374b68e555ac76f0ce5
  1. res/
  2. src/
  3. tests/
  4. proguard.flags