tree e44a4f321170f07d9d2dcfdd9408123e3ab5f4af
parent 3352687ed64d555a3f7c8a1ce7b50e568a330a9e
parent de359dd64aa804c9409e00ad1c3e018c702ee20b
author Sunny Goyal <sunnygoyal@google.com> 1560362193 -0700
committer android-build-merger <android-build-merger@google.com> 1560362193 -0700

Merge "Merge branch 'ub-launcher3-qt-r1-dev' into ub-launcher3-qt-dev" into ub-launcher3-qt-dev am: 58dc1cfc61
am: de359dd64a

Change-Id: I9c04ab6edeba42ef28e962ecac8cc9fea18257d9