tree 2e85eded32daccbf46f6d06789abd47eb0adff80
parent c96a85c9e9462883d589e6272b4900d761d5ef32
parent 4ac2a3668b16e49555a6aee73f7661cca752484c
author Tony Wickham <twickham@google.com> 1560362434 -0700
committer android-build-merger <android-build-merger@google.com> 1560362434 -0700

Merge changes I0b96f623,I019084a1 into ub-launcher3-qt-dev am: 503f46185a
am: 4ac2a3668b

Change-Id: I1bd8d25da249b44708a0a559d1cb9047f55bf753