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