am c4db9d7c: (-s ours) am 81eab3f0: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'c4db9d7ca9b3a35c3bf832abb2f9dadc3c18beda': Import translations. DO NOT MERGE
This commit is contained in: