[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 9223659928
-s ours
am: 545560b547
-s ours
am skip reason: subject contains skip directive
Change-Id: Idc3719dff7c48d853ca8e1918d69bebbb7ebe2c5
main
commit
bea0b23926