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