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