am e386f325: (-s ours) am 7c99551a: am 18facce4: am e3a4a5fd: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit 'e386f32521270a262f3fd899ad8b314e7c06eda2':
This commit is contained in: