am 846f036e
: (-s ours) am 14b82fd7
: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '846f036ef15a2bea6c522e5b75b351b28c29953c': Import translations. DO NOT MERGE
This commit is contained in: