From a0db5a7f4ef209d160646f2c276f8e8810285df9 Mon Sep 17 00:00:00 2001
From: Victor Chang <vichang@google.com>
Date: Thu, 29 Mar 2018 19:06:33 +0100
Subject: [PATCH] Remove the feature flag for time zone picker

Bug: 72376227
Test: m RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.datetime.timezone
Test: manual
Merged-In: I4880f8e37d53879b971890a5d83ebdf1a417a262
Change-Id: I4880f8e37d53879b971890a5d83ebdf1a417a262
(cherry picked from commit 56cb29c0c368a4d75485eabf7f3dfc2933639286)
---
 core/java/android/util/FeatureFlagUtils.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/java/android/util/FeatureFlagUtils.java b/core/java/android/util/FeatureFlagUtils.java
index ff69bcb2e7bb4..a99734d381b04 100644
--- a/core/java/android/util/FeatureFlagUtils.java
+++ b/core/java/android/util/FeatureFlagUtils.java
@@ -41,7 +41,6 @@ public class FeatureFlagUtils {
     static {
         DEFAULT_FLAGS = new HashMap<>();
         DEFAULT_FLAGS.put("settings_battery_display_app_list", "false");
-        DEFAULT_FLAGS.put("settings_zone_picker_v2", "true");
         DEFAULT_FLAGS.put("settings_about_phone_v2", "true");
         DEFAULT_FLAGS.put("settings_bluetooth_while_driving", "false");
         DEFAULT_FLAGS.put("settings_data_usage_v2", "true");