vadimt 1ac98548a7 resolve merge conflicts of 08776ada1e to ub-launcher3-qt-future-dev ...

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I9a3b0f67ee874b5ec4ad67f41a46ec7876d19082
Merged-in: I9a3b0f67ee874b5ec4ad67f41a46ec7876d19082

2019-10-03 20:58:15 +00:00

..

recents_ui_overrides

resolve merge conflicts of 08776ada1e to ub-launcher3-qt-future-dev

2019-10-03 20:58:15 +00:00

res

Add distance threshold for assistant gesture fling

2019-08-08 15:23:24 +00:00

src/com/android

Merge "Fill in LauncherTarget fields with values extracted from LauncherLogProto.Target." into ub-launcher3-qt-future-dev

2019-10-02 23:09:52 +00:00

tests

Merge "Deprecating LauncherInstrumentation constructor with parameter" into ub-launcher3-qt-qpr1-dev

2019-09-27 13:21:46 -07:00

AndroidManifest.xml

Swipe-up support for 3P Launcher

2019-07-11 10:44:56 -07:00