Jon Miranda a87abbad31 resolve merge conflicts of 1bd96b1e96 to ub-launcher3-qt-future-dev ...

Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: Ide6c914d4e69eb4fa70d6634780324cd45a21610

2019-09-06 11:35:34 -07:00

..

recents_ui_overrides

resolve merge conflicts of 1bd96b1e96 to ub-launcher3-qt-future-dev

2019-09-06 11:35:34 -07:00

res

Import translations. DO NOT MERGE

2019-07-15 15:37:48 -07:00

src/com/android

Reduces padding of the Overview shelf in no button mode.

2019-09-03 22:05:20 +00:00

tests

Merge "Enabling debug tracing for all UI tests" into ub-launcher3-qt-qpr1-dev

2019-09-04 12:37:40 -07:00

AndroidManifest.xml

Swipe-up support for 3P Launcher

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