am 5f25ef04: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '5f25ef041243c52fc97b5e3cdea0dfa3af64245c': Import translations. DO NOT MERGE
This commit is contained in: