[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: c38c7db007
-s ours am: c993143422
-s ours
am: 76919956c4
-s ours
am skip reason: subject contains skip directive
Change-Id: Iee6f17d87d5ef031339198961002f22d4371920c
This commit is contained in:
commit
140b3d1e3c