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