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