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