MrSluffy 32922a2e02 Fix conflicts

2024-01-08 16:03:01 +08:00

..

ext_tests/src/com/android/quickstep

Allow Taskbar stashing for external tests

2022-09-21 10:44:23 -07:00

protos_overrides

Merge branch 'heads/android-14.0.0_r18' into 14-dev

2023-12-16 17:18:13 +08:00

res

Fix conflicts

2024-01-08 16:03:01 +08:00

src/com/android

Fix conflicts

2024-01-08 16:03:01 +08:00

tests

Merge branch 'heads/android-14.0.0_r18' into 14-dev

2023-12-16 17:18:13 +08:00

Android.bp

Merge branch 'heads/android-14.0.0_r18' into 14-dev

2023-12-16 17:18:13 +08:00

AndroidManifest-launcher.xml

Implement Smartspacer as an alternative At a Glance provider (#3684)

2023-11-13 10:17:21 +01:00

AndroidManifest.xml

Merge branch 'android14-release' into 14-dev

2023-12-13 18:47:55 +08:00