tree 535b830876fe3ab97adc9e84a9d896301662068f
parent 8474ab2b9dfb05daf82f0afe3f05181a2e40b89c
parent f17eb616a853fbbe30c9973a5a6987f0218503be
author Sunny Goyal <sunnygoyal@google.com> 1559756642 -0700
committer Sunny Goyal <sunnygoyal@google.com> 1559756642 -0700

resolve merge conflicts of f17eb616a853fbbe30c9973a5a6987f0218503be to ub-launcher3-qt-r1-dev

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I4e177dfb7ba3bde6eb53f63c2f2df273feef90ee