tree 98806ec8037ee844595200978bed368d61692fa7
parent 72fddba837afb28ad31f775b566ee4ba3f02eab9
parent 1bd96b1e96a663c835cb263cbc4aa54a7841ab28
author Jon Miranda <jonmiranda@google.com> 1567794934 -0700
committer Jon Miranda <jonmiranda@google.com> 1567794934 -0700

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

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