tree 41253a92adb5d02e959c186d4fcd037c6e66021d
parent 25986ffd64bc59234690fbd5177d7ad665b1d274
parent 521224131ea7a2d52fe58d82079baef5158c3d54
author Tony Wickham <twickham@google.com> 1569024480 -0700
committer android-build-merger <android-build-merger@google.com> 1569024480 -0700

resolve merge conflicts of 5c229885fce2c6b0d925c4146892db4139dd3657 to ub-launcher3-qt-future-dev
am: 521224131e

Change-Id: Id2d960da6c9739c0b20bdea3c5f340741c39941a