[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: d1ddb16617
-s ours
am: 71edc54326
-s ours
am skip reason: subject contains skip directive
Change-Id: I1c6b00133e923a3244304e129869debba5f3f1b9
This commit is contained in: