tree ffdd27bfd4d40e081de5c32aa6f9d9eaa080a2ef
parent cbbc48b8940c25bb91682cd3b8c1d893fce4c262
parent 87c8a511cd4f38f4752a7882fbb4abc7206cefb6
author Sunny Goyal <sunnygoyal@google.com> 1559759571 -0700
committer android-build-merger <android-build-merger@google.com> 1559759571 -0700

resolve merge conflicts of f17eb616a853fbbe30c9973a5a6987f0218503be to ub-launcher3-qt-r1-dev
am: 87c8a511cd

Change-Id: Ie63fe8078b1b9d29d76e1e6e9626fe0be914c100