Sunny Goyal 87c8a511cd resolve merge conflicts of f17eb616a8 to ub-launcher3-qt-r1-dev ...

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

2019-06-05 10:44:02 -07:00

..

recents_ui_overrides

resolve merge conflicts of f17eb616a8 to ub-launcher3-qt-r1-dev

2019-06-05 10:44:02 -07:00

res

Import translations. DO NOT MERGE

2019-05-28 19:13:27 -07:00

src/com/android

Fix getting stuck in BackgroundAppState for 2-button mode

2019-05-31 16:11:40 -07:00

tests

Increasing wait time after mode switch.

2019-05-29 13:05:06 -07:00

AndroidManifest.xml

Improving swipe up interaction when device is locked

2019-05-28 15:55:07 -07:00