tree 97d8259485b0eb46c46dfc250a0605efb77c2dcf
parent ca305cd90949e49705657814fd9ff855a5a81027
parent da9cf0f66b3595518edde8e53b40b0f0c67226c4
author Tony Wickham <twickham@google.com> 1556821953 -0700
committer android-build-merger <android-build-merger@google.com> 1556821953 -0700

Merge changes I705b7a65,I98a2e71a into ub-launcher3-qt-dev
am: da9cf0f66b

Change-Id: I38f22c8c5d704b9e45174d63a1e2057c5c04e835