am 939d0f1d: (-s ours) am 5ba8c670: am 2e0679ed: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '939d0f1d72fe152e655a2c4768fb5f37e7545df3': Import translations. DO NOT MERGE
This commit is contained in: