am 2c636248: (-s ours) am e618963b: (-s ours) am 035e10f8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '2c636248dd7e62c4f17c304df08eb73652d788fa': Import translations. DO NOT MERGE
This commit is contained in: