[automerger skipped] Merge "Create some strings for RTT setting" into qt-qpr1-dev am: 1cdbed55f9
am: c547fc78c7
-s ours
am skip reason: Change-Id I26f218caba46273796e52c244c9f022742f0bdeb with SHA-1 6e996bd8d7
is in history
Change-Id: Ia08be1ec108be1182195308a256d850a8da19fc4
This commit is contained in: