am 5da96060
: (-s ours) am f887a67d
: (-s ours) am aa20b274
: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '5da96060e61c3076d0a5cbd87a3f17254414afeb': Import translations. DO NOT MERGE
This commit is contained in: