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