Pun Butrach 2e76c99dad fix: Conflict incoming changes from 15-dev

2026-01-10 20:49:12 +07:00

..

compose

fix: Conflict incoming changes from 15-dev

2026-01-10 20:49:12 +07:00

dagger/com/android/launcher3/dagger

[Dagger] Move LauncherRestoreEventLoggerImpl to LauncherAppModule

2025-06-06 14:09:48 -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: Conflict incoming changes from 15-dev

2026-01-10 20:49:12 +07:00

src/com/android

fix: Conflict incoming changes from 15-dev

2026-01-10 20:49:12 +07:00

src_protolog/com/android

fix: Conflict incoming changes from 15-dev

2026-01-10 20:49:12 +07:00

testing/com/android/launcher3/taskbar/bubbles/testing

Allocate insane memory just for CI

2026-01-10 20:46:44 +07:00

tests

fix: Conflict incoming changes from 15-dev

2026-01-10 20:49:12 +07:00

Android.bp

fix: Conflict incoming changes from 15-dev

2026-01-10 20:49:12 +07:00

AndroidManifest-launcher.xml

Merge tag 'android-16.0.0_r3' into 16-dev

2026-01-10 20:46:04 +07:00

AndroidManifest.xml

fix: Conflict incoming changes from 15-dev

2026-01-10 20:49:12 +07:00