[automerger skipped] Merge "Merge 24Q4 into AOSP main" into main am: b1c96fcf83 -s ours

Browse Source

am skip reason: Merged-In I2c1246a4b34c6b09a42c05153c0e3f015d475df1 with SHA-1 c47df6271a is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3413682

Change-Id: Idc093e7db9c7ba2c8529651fe643c4b85c8d3481
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

...

This commit is contained in:

Xin Li

2024-12-13 19:42:09 -08:00

committed by Automerger Merge Worker

parent f9ab1c41d6 b1c96fcf83

commit 9ee5de3b2f

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

Diff Content Not Available