am 641234c1: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '641234c172ad72c332bca61fe9f73f8ad1fd8227': Import translations. DO NOT MERGE
This commit is contained in: