am 2c705626: (-s ours) am d4e216bc: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev
* commit '2c705626e5cfa29adddb0f82fca261560d4fd9a8': Revert "Import translations. DO NOT MERGE"
This commit is contained in: