Sunny Goyal 2fb6ae9d0c resolve merge conflicts of f17eb616a8 to ub-launcher3-qt-r1-dev ...

am: 87c8a511cd

Change-Id: Ie63fe8078b1b9d29d76e1e6e9626fe0be914c100

2019-06-05 11:32:51 -07:00

..

recents_ui_overrides

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

2019-06-05 11:32:51 -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

Merge "Increasing wait time after mode switch." into ub-launcher3-qt-dev am: 5a93e5d895

2019-05-29 13:51:12 -07:00

AndroidManifest.xml

Improving swipe up interaction when device is locked

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