mozilla-beta: changeset 232277:1c61b9e3686971e92f4ca64d7b3ba6ae325cba8b

author	Garvan Keeley <gkeeley@mozilla.com>
	Fri, 03 Oct 2014 11:51:00 -0400
changeset 232277	1c61b9e3686971e92f4ca64d7b3ba6ae325cba8b
parent 232276	d99a7f64432a3ee7956e7bfae05e0d6256370041
child 232278	e17d2378aa66400f93ac37325c35cfd23d941636
push id	4187
push user	bhearsum@mozilla.com
push date	Fri, 28 Nov 2014 15:29:12 +0000
treeherder	mozilla-beta@f23cc6a30c11 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	mfinkle
bugs	1061991
milestone	35.0a1
first release with	nightly linux32 9ee9e193fc48 / 35.0a1 / 20141007030202 / files nightly linux64 9ee9e193fc48 / 35.0a1 / 20141007030202 / files nightly mac 9ee9e193fc48 / 35.0a1 / 20141007030202 / files nightly win32 9ee9e193fc48 / 35.0a1 / 20141007030202 / files nightly win64 9ee9e193fc48 / 35.0a1 / 20141007030202 / files
last release without	nightly linux32 0ed32d9a42d6 / 35.0a1 / 20141006030202 / files nightly linux64 0ed32d9a42d6 / 35.0a1 / 20141006030202 / files nightly mac 0ed32d9a42d6 / 35.0a1 / 20141006030202 / files nightly win32 0ed32d9a42d6 / 35.0a1 / 20141006030202 / files nightly win64 0ed32d9a42d6 / 35.0a1 / 20141006030202 / files

--- a/mobile/android/base/AndroidManifest.xml.in
+++ b/mobile/android/base/AndroidManifest.xml.in
@@ -18,20 +18,18 @@
 #include ../services/manifests/FxAccountAndroidManifest_permissions.xml.in
 #include ../services/manifests/HealthReportAndroidManifest_permissions.xml.in
 #include ../services/manifests/SyncAndroidManifest_permissions.xml.in
 
 #ifdef MOZ_ANDROID_SEARCH_ACTIVITY
 #include ../search/manifests/SearchAndroidManifest_permissions.xml.in
 #endif
 
-#ifndef RELEASE_BUILD
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
-#endif
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT"/>
     <uses-permission android:name="com.android.launcher.permission.UNINSTALL_SHORTCUT"/>
     <uses-permission android:name="com.android.browser.permission.READ_HISTORY_BOOKMARKS"/>