am 315e78bd
: (-s ours) am 2ba49855
: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '315e78bd4d033e777426a46952a752d724278f18': Import translations. DO NOT MERGE
This commit is contained in: