am c2314e32
: (-s ours) am 083e6cc0
: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'c2314e3229861a483b67b03dda2f9425b3b5cc68': Import translations. DO NOT MERGE
This commit is contained in: