am 8f737ee8: (-s ours) am 3e2d53b0: (-s ours) Import translations. DO NOT MERGE

* commit '8f737ee801eeab24272216e4fae1c8e05ad42860':
tree: 682e9a1142263033af979e68e0146cb79cf810d6
  1. res/
  2. src/
  3. tests/
  4. proguard.flags