am 779660c9: (-s ours) am 77758fae: (-s ours) Merge "Import translations. DO NOT MERGE"

* commit '779660c9625a346590ca6ebcb87c17c24b03521e':
1 file changed
tree: 4fa3ca3f2cc6c0c45a5b11d26e7ad162173a70fe
  1. res-common/
  2. src/
  3. tests/