[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: e801eb78f0
-s ours
am: e92a1a9c2a
-s ours
am skip reason: subject contains skip directive
Change-Id: Iabbb3d37b7c47cd0edfb6a38f447fcb23dd7163a
This commit is contained in:
commit
7b24ec6a1f