am e912b763: (-s ours) am e30adf2f: am d2bd59f5: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
* commit 'e912b763ee9e631129512162c3e934aaf4bc1e91': Import translations. DO NOT MERGE
This commit is contained in: