Merge "Revert "Revert "Revert "Revert "Enable ADVANCED_VPN_ENABLED For Droidfood""""" into udc-dev am: d16683717c

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22574505

Change-Id: I7b457442646c522fb45e7278767750becb0d79a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Robert Luo
2023-04-26 10:32:17 +00:00
committed by Automerger Merge Worker

View File

@@ -686,8 +686,8 @@ object Flags {
// TODO(b/272805037): Tracking Bug
@JvmField
val ADVANCED_VPN_ENABLED = unreleasedFlag(2800, name = "AdvancedVpn__enable_feature",
namespace = "vpn", teamfood = true)
val ADVANCED_VPN_ENABLED = releasedFlag(2800, name = "AdvancedVpn__enable_feature",
namespace = "vpn")
// TODO(b/278761837): Tracking Bug
@JvmField