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