Merge "handle_compcache: update props to match MemoryManagement in settings" into ics
diff --git a/config/common.mk b/config/common.mk
index 259b697..68b02e6 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -72,6 +72,7 @@
 PRODUCT_PACKAGES += \
     VideoEditor \
     VoiceDialer \
+    SoundRecorder \
     Basic \
     HoloSpiralWallpaper \
     MagicSmokeWallpapers \
@@ -99,19 +100,19 @@
 PRODUCT_BUILD_PROP_OVERRIDES += BUILD_DISPLAY_ID=IML74K
 
 ifdef CM_NIGHTLY
-    PRODUCT_PROPERTY_OVERRIDES += \
-        ro.cm.version=$(PRODUCT_VERSION_MAJOR)-$(shell date +%m%d%Y)-NIGHTLY-$(PRODUCT_RELEASE_NAME)
+    CM_VERSION :=$(PRODUCT_VERSION_MAJOR)-$(shell date +%Y%m%d)-NIGHTLY-$(CM_BUILD)
 else
     ifdef CM_SNAPSHOT
-        PRODUCT_PROPERTY_OVERRIDES += \
-            ro.cm.version=$(PRODUCT_VERSION_MAJOR)-$(shell date +%m%d%Y)-SNAPSHOT-$(PRODUCT_RELEASE_NAME)$(CM_EXTRAVERSION)
+        CM_VERSION := $(PRODUCT_VERSION_MAJOR)-$(shell date +%Y%m%d)-SNAPSHOT-$(CM_BUILD)$(CM_EXTRAVERSION)
     else
         ifdef CM_RELEASE
-            PRODUCT_PROPERTY_OVERRIDES += \
-                ro.cm.version=$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)$(PRODUCT_VERSION_DEVICE_SPECIFIC)-$(PRODUCT_RELEASE_NAME)
+            CM_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)$(PRODUCT_VERSION_DEVICE_SPECIFIC)-$(CM_BUILD)
         else
-            PRODUCT_PROPERTY_OVERRIDES += \
-                ro.cm.version=$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)$(PRODUCT_VERSION_DEVICE_SPECIFIC)-$(PRODUCT_RELEASE_NAME)-KANG
+            CM_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)$(PRODUCT_VERSION_DEVICE_SPECIFIC)-$(CM_BUILD)-KANG
         endif
     endif
 endif
+
+PRODUCT_PROPERTY_OVERRIDES += \
+  ro.cm.version=$(CM_VERSION) \
+  ro.modversion=$(CM_VERSION)
\ No newline at end of file
diff --git a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw-cs/main.dict b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw-cs/main.dict
new file mode 100644
index 0000000..5881e03
--- /dev/null
+++ b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw-cs/main.dict
Binary files differ
diff --git a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw-nl/main.dict b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw-nl/main.dict
new file mode 100644
index 0000000..f1207f8
--- /dev/null
+++ b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw-nl/main.dict
Binary files differ
diff --git a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw-ru/main.dict b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw-ru/main.dict
index 039dcb1..5055813 100644
--- a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw-ru/main.dict
+++ b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw-ru/main.dict
Binary files differ
diff --git a/tools/squisher b/tools/squisher
index cbd154f..ce5e916 100755
--- a/tools/squisher
+++ b/tools/squisher
@@ -144,6 +144,7 @@
 	MODVERSION=`sed -n -e'/ro\.cm\.version/s/^.*=//p' $REPACK/ota/system/build.prop`
 	: ${MODVERSION:=nightly}
 	OUTFILE=$OUT/update-cm-$MODVERSION-signed.zip
+	echo MODVERSION: $MODVERSION
 else
 	OUTFILE=$OUT/update-squished.zip
 fi