tree 4da48b5478fe8d3f315b6a81dc2c554132ce6559
parent 76e4fde650060825bb8a2241cb194c8d8d9943a2
parent fe96539f5e54c2235c76ccf57612678e0524b93c
author Weng Su <wengsu@google.com> 1707116825 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1707116825 +0000

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

am skip reason: contains skip directive

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

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