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