Revert "use KitKat zRAM setting"

This reverts commit 2a2674f2360d716baf06e96f76168b6f925a5f4b.

Conflicts:

	device.mk
	profiles/ramdisk/init.mapphone_umts.rc
Merge remote-tracking branch 'upstream/cm11.0-2.6.32' into kitkat-aosp

Conflicts:
	device.mk
Revert "add cmupdater url"

This reverts commit 10f3e8face5808677cd30e7a497fd19b257ae046.
Revert "Add CMUpdater support"

This reverts commit b54b87dc46e7de4727cfdd749aa6f50dc2c361fb.
Merge remote-tracking branch 'upstream/cm11.0-2.6.32' into kitkat-aosp
Merge branch 'kitkat-aosp' into defy-4.4-2.6.32

Conflicts:
	device.mk
disable suspend feature for interactive governor
this helps to eliminate incall delay
fix screen off animation
without this screen off animation can't be changed
Revert "temporarily disable oc"

This reverts commit e919487fc8e8ed5c0557ec6984e48dd458c833fc.
add more twrp options
use 3.0 kernel for twrp
leave only MPEG4 codec
Fix bootmenu permissions after installing an incremental update.

This could break booting after flashing an incremental. Unfortunately
I'm not sure what breaks the permissions when flashing the incremental.
Merge pull request #20 from xdarklight/cm11.0-2.6.32

Fix bootmenu permissions after installing an incremental update.
add flag rmrf for system
Merge remote-tracking branch 'upstream/cm11.0-2.6.32' into kitkat-aosp

Conflicts:
	overlay/packages/services/Telephony/res/values/array.xml
	overlay/packages/services/Telephony/res/values/config.xml
	profiles/ramdisk/init.mapphone_umts.rc
Do not enable CrystalTalk, not ready
Revert "leave only MPEG4 codec"
not needed for aosp/omni

This reverts commit 4bccc330b07716df3154e8d79bba41d045ba5661.
Merge branch 'kitkat-aosp' into defy-4.4-2.6.32

Conflicts:
	releasetools/jordan-common_ota_from_target_files.py
Update, cleanup
Add 3.13 kernel baclports
Switch to 3.13 wifi driver.
Fix wifi calibration, now WiFi sohuld work on every devices(even without /pds)
Prepare to use bluez4/5
Temporary use prebuilt hostapd