[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 4061ed5736
-s ours am: 751578eb61
-s ours
am: d2688654cb
-s ours
am skip reason: subject contains skip directive
Change-Id: I977e654b96f26fd82e4170b9c30956b86647f407
main
commit
30dec36ef8