tree 56b223751d6fafe816a27e693e3afa8f45b1b47f
parent ef715962818a7bf7873a068e29e4e479800eab69
parent a71eb50f991e799ff0a5afebdcc5bdd8af0e1334
author Weng Su <wengsu@google.com> 1707090089 +0000
committer Weng Su <wengsu@google.com> 1707090944 +0000

[conflict] [RESTRICT AUTOMERGE] Restrict WifiDialogActivity am: aabb15de74 am: a71eb50f99

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

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