[automerger skipped] Merge changes I82856f84,I97c44ff8 into qt-dev am:...
[automerger skipped] Merge changes I82856f84,I97c44ff8 into qt-dev am: 5d6551b5 am: e96f25a6 -s ours
am: 1959fe19 -s ours
am skip reason: change_id I574e3287df8915218ded60f010821eb9a75ae727 with SHA1 4abf200f is in history
Change-Id: Icaddfa48cf9e759f7825162f58c7b1fb8a1eabaa