[automerger skipped] Merge "Fix test failed of SatelliteSettingsPreferenceControllerTest" into main am: 08906d9c93 -s ours

Browse Source

am skip reason: Merged-In Icf82dab5a497304df9c3e6a8159e5806ac687445 with SHA-1 48895aaf03 is already in history

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

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

...

This commit is contained in:

Treehugger Robot

2025-03-20 05:40:37 -07:00

committed by Automerger Merge Worker

parent 140808ff06 08906d9c93

commit c36e3061ac

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