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