[automerger skipped] Merge "Only one channel is reserved for WifiP2pSettings" am: 4444a35bcf am: 71a123db03 am: a7efff1ddb -s ours

Browse Source

am skip reason: Merged-In I999b108bc3e3c22519398a55b503078c1069cef1 with SHA-1 b6c2ed6759 is already in history

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

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

...

This commit is contained in:

Treehugger Robot

2022-11-30 01:11:15 +00:00

committed by Automerger Merge Worker

parent 8f34efe5cb a7efff1ddb

commit 389af164d6

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