am 040cb642: (-s ours) am 886ac25c: (-s ours) am 449dc733: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '040cb642e30e77879f4713ce75db169dca16e58a': Import translations. DO NOT MERGE
This commit is contained in: