am c6ccb8a3: (-s ours) am 7138395b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'c6ccb8a3d436f2cfe563daf78a5c6706cb7d4274': Import translations. DO NOT MERGE
This commit is contained in: