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