tree baa92cd7f89af927d77d682f84c8949e303edd44
parent ac6f69f78d4d8d58b12cc58e2074181aca28a1ba
parent a87abbad31ac1f7889803f60cda55db979a03e9f
author TreeHugger Robot <treehugger-gerrit@google.com> 1568062047 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1568062047 +0000

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