am 0840f961: (-s ours) am b7180c45: (-s ours) Merge "Import translations. DO...
am 0840f961: (-s ours) am b7180c45: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev automerge: 2a5f0b4e -s ours
* commit '0840f961':
Import translations. DO NOT MERGE