am fba7df30: (-s ours) am 2fa95373: (-s ours) am 025b6ecf: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'fba7df3034a3470b32e01653dfad0aca200ac3ae': Import translations. DO NOT MERGE
This commit is contained in: