tree 0747273db92b9cece5eca55719e6d6aaf3e31eaf
parent 4fbfed8c94236984416e9fc1dcc468f41e6710b1
parent a10cad4433b4bdc7c53d94057c256af32664f730
author Weng Su <wengsu@google.com> 1707114228 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1707114228 +0000

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

am skip reason: contains skip directive

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

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