mozilla-inbound: changeset 196321:cb8ca90a354da01df7bfaa11a32cc88bd4c1db88

☠☠ backed out by 91abb890c863 ☠ ☠
author	Richard Newman <rnewman@mozilla.com>
	Fri, 25 Jul 2014 13:27:49 -0700
changeset 196321	cb8ca90a354da01df7bfaa11a32cc88bd4c1db88
parent 196320	894afa1b44ae1d3b72279d835ec0e7ebabeda17b
child 196322	91abb890c863d1297cc9fa999dac23bdf864cbcb
push id	46844
push user	cbook@mozilla.com
push date	Mon, 28 Jul 2014 14:30:47 +0000
treeherder	mozilla-inbound@7dd701896de8 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	mfinkle
bugs	1042382
milestone	34.0a1
first release with	nightly linux32 b17cad2d1e5e / 34.0a1 / 20140729030202 / files nightly linux64 b17cad2d1e5e / 34.0a1 / 20140729030202 / files nightly mac b17cad2d1e5e / 34.0a1 / 20140729030202 / files nightly win32 b17cad2d1e5e / 34.0a1 / 20140729030202 / files nightly win64 b17cad2d1e5e / 34.0a1 / 20140729030202 / files
last release without	nightly linux32 613e79262240 / 34.0a1 / 20140725030202 / files nightly linux64 613e79262240 / 34.0a1 / 20140725030202 / files nightly mac 613e79262240 / 34.0a1 / 20140725030202 / files nightly win32 613e79262240 / 34.0a1 / 20140725030202 / files nightly win64 613e79262240 / 34.0a1 / 20140725030202 / files

--- a/mobile/android/base/AndroidManifest.xml.in
+++ b/mobile/android/base/AndroidManifest.xml.in
@@ -4,17 +4,20 @@
       package="@ANDROID_PACKAGE_NAME@"
       android:installLocation="auto"
       android:versionCode="@ANDROID_VERSION_CODE@"
       android:versionName="@MOZ_APP_VERSION@"
 #ifdef MOZ_ANDROID_SHARED_ID
       android:sharedUserId="@MOZ_ANDROID_SHARED_ID@"
 #endif
       >
-    <uses-sdk android:minSdkVersion="9"
+    <uses-sdk android:minSdkVersion="@MOZ_ANDROID_MIN_SDK_VERSION@"
+#ifdef MOZ_ANDROID_MAX_SDK_VERSION
+              android:maxSdkVersion="@MOZ_ANDROID_MAX_SDK_VERSION@"
+#endif
               android:targetSdkVersion="@ANDROID_TARGET_SDK@"/>
 
 #include ../services/manifests/AnnouncementsAndroidManifest_permissions.xml.in
 #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