am 12b2abe2: (-s ours) am 9a8db293: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '12b2abe21daf5b7fb78414dd5d884bd2f723b46b': Import translations. DO NOT MERGE
This commit is contained in: