tree 27329690aa079496a4a8c6a16d815d676f03ac27
parent ba02fa4585f5df13f562a98d8e8cc7e446219997
parent 0a07dfa25da678a51b88bbc40199fd54fadf44ad
author Jon Miranda <jonmiranda@google.com> 1568063746 -0700
committer android-build-merger <android-build-merger@google.com> 1568063746 -0700

Merge "resolve merge conflicts of 1bd96b1e96a663c835cb263cbc4aa54a7841ab28 to ub-launcher3-qt-future-dev" into ub-launcher3-qt-future-dev
am: 0a07dfa25d

Change-Id: I8543792dba5f447d80513f5aa59d67983f66e120