Liquify
Revert "msm8960-common: ril: Avoid collision with RIL constant 1138"

This reverts commit c4a0ec453ca9750c0e8e74c3f444c6722c8caffb.
Revert "msm8960: update libril from qcril merge"

This reverts commit 480b61724909fe7cdb6ecb54834aa016d7951646.
props: add gps blobs

Change-Id: Ib68c6f5aaf296bab1d059ff7728ffc0ec9a08919
m8: misc cleanup

* remove unneeded snd_soc_*
* remove msm8x74 inherit
* move makelinks.sh include to a sane place

Change-Id: I105e1a80bd6e21e0ec929ab9b45616261d4d11bf

Conflicts:
	device.mk
m8: remove references to snd_soc_msm

Change-Id: Ib9162d8916867cbb08de65840a5d0e7605543b1c
m8: add volume rocker wake support

Change-Id: Icaa2c4659c919f392f5c44cc66f21696f83a720f
m8: Better mount options to improve performance

Change-Id: Id539c7b7a6086034b491efa3729dd4c5e9524393
audio: remove unused audio_effects.conf

Change-Id: I73d8b490559fe098ce09d5e323d92f94ca7b48c5
m8: Enable use of FFMPEG codecs for extended formats

Change-Id: I181507b1b2fdc4dfbda1afffc3ed88fddda92d09
missing fm script and update permissions for radio0

Change-Id: I67dd1f219bea0fb8be579e11f85d6f4a31d24695
m8: merge BoardConfig/BoardConfigCommon

Change-Id: I319ec880230dabf6f0154ddd0deb8f06ae2c2bbe

Conflicts:
	BoardConfig.mk
	BoardConfigCommon.mk
Enable LTE network settings

The only options we have to choose from are 3G & 2G. If either of those are selected there is no way to get back on an LTE network.

Change-Id: Ie2e41ff9e2c964ef3a47844d1702cf40df180bdc
Enable LTE network settings

The only options we have to choose from are 3G & 2G. If either of those are selected there is no way to get back on an LTE network.

Change-Id: Ie2e41ff9e2c964ef3a47844d1702cf40df180bdc
m8: Add HTC market permissions

Change-Id: I90eefd4d61df7d1f608bfed87c06064775cd6c1b
Merge branch 'kitkat' of https://github.com/LiquidSmooth/android_device_htc_m8 into kitkat
props: move to system.prop and general cleanup

Change-Id: I8656d8ba1b837602e9d294762304faf1d4363f53

Conflicts:
	device.mk
Merge remote-tracking branch 'upstream/cm-11.0' into kitkat

Conflicts:
	BoardConfig.mk
	cm.dependencies
	device.mk
	overlay/packages/services/Telephony/res/values/config.xml
	system.prop
Missing separator
Add Sprint defualt RIL properties

Change-Id: I9bf94393b50c49eedc0780dda1559302e6425eb5