tree 1d8617d3d04339048802e1ac5c9be4fabae31027
parent b0738b0739dac1dc8b55e3c83e36188ba66974e9
parent 848696ac1dcf1a90492f7bc794cd05747803dbc4
author Tony Wickham <twickham@google.com> 1578521716 -0800
committer Tony Wickham <twickham@google.com> 1578521716 -0800

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

Test: manual, presubmit on the source branch
http://x20/teams/android-launcher/merge/ub-launcher3-qt-future-dev_6099678.html

Change-Id: I205e6a8dc0042dd69d62c319c170b4bbed378c75