msm8960-common: rm device settings

Change-Id: I0802cc122b606b08f58731febd8bf050d22f4c57
Add NFC host-based card emulation feature.

Change-Id: Ibe4b3cef46e3daede150925a4608108140872ce1
Build MemTrack HAL

Change-Id: I3096069b1f08799b7871f8fbb50a28c314a4991c
upgrade to motox 4.4 adreno  release

Change-Id: I00007b26355637d3331eca7ff3b660503163fe3b
Merge "upgrade to motox 4.4 adreno  release" into cm-11.0
msm8960-common: move egl.cfg to d2/jf trees

* there are some in this school that are too cool for the school
* others are not as cool for the school so we'll treat them different

Change-Id: I104b46d5f5828eceda80501830bc36e40e0b00e4
Merge "Add NFC host-based card emulation feature." into cm-11.0
msm8960: Enable QCOM_BSP to fix netflix video

This fixes Netflix video playback the correct way

Change-Id: I79338c5a9a1f5335cea7ff4f16ab10ced8ff5901
sepolicy for msm8960-common

Change-Id: Id9948a8029e15d69a7627c7edf1fa415d91ef807
Merge "sepolicy for msm8960-common" into cm-11.0
Merge remote-tracking branch 'cm/cm-11.0' into kk-4.4

Conflicts:
	DeviceSettings/Android.mk
	DeviceSettings/src/com/cyanogenmod/settings/device/HapticFragmentActivity.java
	DeviceSettings/src/com/cyanogenmod/settings/device/SensorsFragmentActivity.java
	DeviceSettings/src/com/cyanogenmod/settings/device/SoundFragmentActivity.java
	DeviceSettings/src/com/cyanogenmod/settings/device/VibratorTuningPreference.java
	configs/egl.cfg