Revert "flo: merge tag 'android-4.4.4_r1'"

This reverts commit debd40f. Change-Id: I94969744ce55620b225db93a4fc6490f3dd73e3b
multirom-dev · Jul 8, 2014 · 2fa8c78 · 2fa8c78
1 parent debd40f
commit 2fa8c78
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 9 deletions.
diff --git a/WCNSS_cfg.dat b/WCNSS_cfg.dat
diff --git a/WCNSS_qcom_cfg.ini b/WCNSS_qcom_cfg.ini
@@ -247,8 +247,5 @@ 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=937116
+BUILD=748593
 DEVICE=flo
 PRODUCT=razor
-VERSION=kot49h
+VERSION=jss15j
 SRCPREFIX=signed-
-BOOTLOADER=flo-04.02
+BOOTLOADER=flo-03.14
 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-937116
-  BUILD=kot49h
-fi # klp-dev
+  ZIP=razor-ota-748593
+  BUILD=jss15j
+fi # jb-mr2-dev
 ROOTDEVICE=flo
 DEVICE=flo
 MANUFACTURER=asus