tree cacf744d7151436f3a64d4c007a5caa597442fe7
parent c95682730ba8920b8c2c653b7021521add5c15de
parent 2a9ea31fb5b119689a335e90f3cf4f0008ea681b
author Weng Su <wengsu@google.com> 1707111632 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1707111632 +0000

[automerger skipped] [conflict] [RESTRICT AUTOMERGE] Restrict WifiDialogActivity am: aabb15de74 am: a71eb50f99 am: 2a9ea31fb5 -s ours

am skip reason: contains skip directive

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

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