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