tree 5f1ff683032431ae868a3a882afa2773b10d528d
parent 6b466783b70c4ab8511bdfbaf0a6939fafad3d5e
parent 1343f03e2ed6de99bbb952017e3c6266679513d8
author Tony Wickham <twickham@google.com> 1564612610 -0700
committer android-build-merger <android-build-merger@google.com> 1564612610 -0700

Merge changes Ib3e373c2,Ia5d6f545 into ub-launcher3-qt-r1-dev
am: 1343f03e2e

Change-Id: Ie3f4c2c15e331c84f0f048c6337ae4e58111ec56