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