tree 75ecf0e40bd8662201ac61df772e52cb3b6c2af1
parent 99c0b8baf6073c4f0da507d2f44d823737c6ab01
parent ee773103f837e64d3fbc2f1fc804975a08328b03
author Weng Su <wengsu@google.com> 1670663782 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1670663782 +0000

Merge "fix WifiUtils:isNetworkLockedDown() null pointer issue" am: 956f288d1d am: ee773103f8

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

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