mozilla-inbound: changeset 271112:91c66ca62277413b88b74f6f7fc5176c079afdf2

author	Nick Alexander <nalexander@mozilla.com>
	Mon, 02 Nov 2015 15:04:40 -0800
changeset 271112	91c66ca62277413b88b74f6f7fc5176c079afdf2
parent 271111	a2fd04686fd78e86337bda329dd8668f96c08387
child 271113	b423610b2e44ba5b63458608d4f78c979d970e77
push id	67553
push user	cbook@mozilla.com
push date	Wed, 04 Nov 2015 11:31:24 +0000
treeherder	mozilla-inbound@8868503916ba [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	margaret
bugs	1220891
milestone	45.0a1
first release with	nightly linux32 6077f51254c6 / 45.0a1 / 20151104030437 / files nightly linux64 6077f51254c6 / 45.0a1 / 20151104030437 / files nightly mac 6077f51254c6 / 45.0a1 / 20151104030437 / files nightly win32 6077f51254c6 / 45.0a1 / 20151104030437 / files nightly win64 6077f51254c6 / 45.0a1 / 20151104030437 / files
last release without	nightly linux32 bb4d614a0b09 / 45.0a1 / 20151103030248 / files nightly linux64 bb4d614a0b09 / 45.0a1 / 20151103030248 / files nightly mac bb4d614a0b09 / 45.0a1 / 20151103030248 / files nightly win32 bb4d614a0b09 / 45.0a1 / 20151103030248 / files nightly win64 bb4d614a0b09 / 45.0a1 / 20151103030248 / files

--- a/mobile/android/confvars.sh
+++ b/mobile/android/confvars.sh
@@ -113,15 +113,10 @@ MOZ_ANDROID_FIREFOX_ACCOUNT_PROFILES=1
 # Enable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=1
 
 # Enable the Switchboard A/B framework code.
 # Note: The framework is always included in the app. This flag controls
 # usage of the framework.
 MOZ_SWITCHBOARD=1
 
-# Use native Firefox Accounts UI after Nightly.
-if ! test "$NIGHTLY_BUILD"; then
-MOZ_ANDROID_NATIVE_ACCOUNT_UI=1
-fi
-
 # Disable GeckoView by default.
 export MOZ_DISABLE_GECKOVIEW=1