Hongwei Wang 5a0ee40cf4 Resolve missing merge conflict ...

See also ag/10265874

Test: N/A
Change-Id: I3d621ad5bb0d733468e6a642842f065ea83d696a

2020-02-06 17:13:03 -08:00

..

recents_ui_overrides

Merging from ub-launcher3-master @ build 6188107

2020-02-06 15:03:07 -08:00

res

Adding SecondaryDisplayLauncher in Launcher using common listener

2020-01-30 08:27:27 +00:00

src/com/android

Resolve missing merge conflict

2020-02-06 17:13:03 -08:00

tests

Merging from ub-launcher3-master @ build 6188107

2020-02-06 15:03:07 -08:00

AndroidManifest-launcher.xml

Subclassing Launcher instead of using UiFactory

2019-10-21 11:10:21 -07:00

AndroidManifest.xml

Tips Gesture Navigation Tutorial [Part 2]

2020-01-06 16:33:55 -08:00