fix: Conflict incoming changes from 15-dev

Browse Source

...

This commit is contained in:

Pun Butrach

2025-11-22 17:14:31 +07:00

parent 14e352c827

commit 2e76c99dad

1726 changed files with 146971 additions and 95028 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

flags/src/com/android/window/flags2/Flags.java

+468 -581

File diff suppressed because it is too large Load Diff