tree a1a981f65c0ac1744f46c2f05f7777419127a86e
parent 47835458089c656139246f13dbcd5baedfec3c16
parent 9353b00616ac688d2df6b9f8513c4895bb4119d7
author Hyunyoung Song <hyunyoungs@google.com> 1574238759 -0800
committer Hyunyoung Song <hyunyoungs@google.com> 1574239259 +0000

Merging from ub-launcher3-qt-future-dev @ build 6018744

Test: manual, presubmit on the source branch
http://x20/teams/android-launcher/merge/ub-launcher3-qt-future-dev_6018744.htmlMerge commit '9353b00616ac688d2df6b9f8513c4895bb4119d7' into merge_ub-launcher3-qt-future-dev_6018744

Change-Id: Ie6235a262b7bba0aa9f2a2962a7aa499a0a2cb53
Merged-In: I8a1e20d0b175f03a1a05c81749f07ab5314e872a