am ed8c4096: (-s ours) am 71b82aed: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit 'ed8c4096192b247d431bde149518ef87ba7e331a': Import translations. DO NOT MERGE
This commit is contained in: