flo: merge tag 'android-4.4.4_r1'

Conflicts: WCNSS_qcom_cfg.ini Change-Id: I2d69ec81ac71a8b67e731eb8e348618d971613e5
multirom-dev · Jun 20, 2014 · debd40f · debd40f
1 parent a16b792
commit debd40f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/WCNSS_cfg.dat b/WCNSS_cfg.dat
diff --git a/WCNSS_qcom_cfg.ini b/WCNSS_qcom_cfg.ini
@@ -247,5 +247,8 @@ gTDLSRSSITriggerThreshold=-60
 gTDLSIdlePacketThreshold=5
 gTDLSRSSITeardownThreshold=-70
 
+# Enable IPv6 RA filtering
+gMCAddrListEnable=1
+
 END
 # Note: Configuration parser would not read anything past the END marker
diff --git a/factory-images/generate-factory-images-package.sh b/factory-images/generate-factory-images-package.sh
@@ -25,10 +25,10 @@
 # end jb-mr2-dev
 
 source ../../../common/clear-factory-images-variables.sh
-BUILD=748593
+BUILD=937116
 DEVICE=flo
 PRODUCT=razor
-VERSION=jss15j
+VERSION=kot49h
 SRCPREFIX=signed-
-BOOTLOADER=flo-03.14
+BOOTLOADER=flo-04.02
 source ../../../common/generate-factory-images-common.sh
diff --git a/self-extractors/generate-packages.sh b/self-extractors/generate-packages.sh
@@ -33,9 +33,9 @@
 BRANCH=klp-dev
 if test $BRANCH = klp-dev
 then
-  ZIP=razor-ota-748593
-  BUILD=jss15j
-fi # jb-mr2-dev
+  ZIP=razor-ota-937116
+  BUILD=kot49h
+fi # klp-dev
 ROOTDEVICE=flo
 DEVICE=flo
 MANUFACTURER=asus