[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: ea59105148
-s ours
am: 0db63f2126
-s ours
am skip reason: subject contains skip directive
Change-Id: I474bce6062842b252ea588094402953a55450c1b
This commit is contained in:
commit
248c274b79