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