[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 6562981448
-s ours
am: adb2e7a485
-s ours
am skip reason: subject contains skip directive
Change-Id: I36b41078a2c26a9968789143df182ed1c57cd30a
main
commit
29c40ed017