[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: ac121a2820
-s ours
am: 6e86fcac8a
-s ours
am skip reason: subject contains skip directive
Change-Id: Ic3652fac211980b4ed65b2ba02c13449b2c2516b
This commit is contained in:
commit
c19ed2a569