tree 973e6ee198771f0e8b493a97c267992dd1927534
parent a9d870828c0edc07b860aa120fe50e7ad47b5926
parent 1ac98548a73e6c82876433c5ab0f037c6da688cd
author vadimt <vadimt@google.com> 1570138776 -0700
committer android-build-merger <android-build-merger@google.com> 1570138776 -0700

[automerger skipped] resolve merge conflicts of 08776ada1e37c4b424893306c058b1de9f85903f to ub-launcher3-qt-future-dev
am: 1ac98548a7 -s ours
am skip reason: change_id I9a3b0f67ee874b5ec4ad67f41a46ec7876d19082 with SHA1 a9d870828c is in history

Change-Id: I0db7aa760ba1d1f871cd0936a12f40f2e8311eab