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