[automerger skipped] resolve merge conflicts of 08776ada to ub-launcher3-qt-future-dev
am: 1ac98548 -s ours
am skip reason: change_id I9a3b0f67ee874b5ec4ad67f41a46ec7876d19082 with SHA1 a9d87082 is in history
Change-Id: I0db7aa760ba1d1f871cd0936a12f40f2e8311eab