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