[automerger skipped] Merge "Legacy VPN Configuration Dialog includes error message if VPN is an insecure type." into sc-dev am: 37a7b7df48
-s ours
am skip reason: skip tag Change-Id I528d46654a39df04b647d6d0137aaf80e7adb05c with SHA-1 5d92ad5232
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13960261
Change-Id: Ib27b2e4af803e35f96feda2b22d1837869439473
This commit is contained in: