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