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

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

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

View File

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