am c82b385b
: (-s ours) am 50bfc55e
: am e3a4a5fd
: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit 'c82b385ba2822a5f90a770fa66e4183f5fbc7df7': Import translations. DO NOT MERGE
This commit is contained in: