summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraruslan@chromium.org <aruslan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-10 00:06:16 +0000
committeraruslan@chromium.org <aruslan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-10 00:06:16 +0000
commitc79bced50e6b7216e758896257ee0e1348319485 (patch)
tree7ee264dde54cd1cf841097706e7ee3c3278b35b4
parente3e192720c1185bad793c8a9d967b08a889e6ae9 (diff)
downloadchromium_src-c79bced50e6b7216e758896257ee0e1348319485.zip
chromium_src-c79bced50e6b7216e758896257ee0e1348319485.tar.gz
chromium_src-c79bced50e6b7216e758896257ee0e1348319485.tar.bz2
Merge 262868 "[Mirror Android] Temporarily remove the Mirror flag."
> [Mirror Android] Temporarily remove the Mirror flag. > > Once in trunk this needs to be picked up to M35 beta branch. > Once picked up, this needs to be reverted on trunk. > > BUG=361827 > NOTRY=True > > Review URL: https://codereview.chromium.org/231983003 TBR=aruslan@chromium.org Review URL: https://codereview.chromium.org/232383002 git-svn-id: svn://svn.chromium.org/chrome/branches/1916/src@262870 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/about_flags.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index a192adb..208a6d5 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -1498,7 +1498,7 @@ const Experiment kExperiments[] = {
"enable-new-profile-management",
IDS_FLAGS_ENABLE_NEW_PROFILE_MANAGEMENT_NAME,
IDS_FLAGS_ENABLE_NEW_PROFILE_MANAGEMENT_DESCRIPTION,
- kOsAndroid | kOsMac | kOsWin | kOsLinux,
+ kOsMac | kOsWin | kOsLinux,
SINGLE_VALUE_TYPE(switches::kNewProfileManagement)
},
{