From a9d870828c0edc07b860aa120fe50e7ad47b5926 Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Thu, 3 Oct 2019 13:34:28 -0700
Subject: [PATCH] resolve merge conflicts of
 08776ada1e37c4b424893306c058b1de9f85903f to ub-launcher3-qt-future-dev

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