samsung krait: add msm8974 to build barrier

Change-Id: I61adb916c5091f4f9fb30e1078067f27458974b0
Revert "samsung krait: add msm8974 to build barrier"

This reverts commit 0bfe4c57d1b12e14bef31f49b8dc775f2c2c726a.

Change-Id: I08d89dee28ed0bb779dd7519de2b566dfb02158c
msm8960-common: rm device settings

Change-Id: I0802cc122b606b08f58731febd8bf050d22f4c57

Conflicts:
	DeviceSettings/res/values-de/arrays.xml
	DeviceSettings/res/values-de/strings.xml
	DeviceSettings/res/values-es/arrays.xml
	DeviceSettings/res/values-es/strings.xml
	DeviceSettings/res/values-fi/arrays.xml
	DeviceSettings/res/values-fi/strings.xml
	DeviceSettings/res/values-fr/arrays.xml
	DeviceSettings/res/values-hu/arrays.xml
	DeviceSettings/res/values-hu/strings.xml
	DeviceSettings/res/values-nl/arrays.xml
	DeviceSettings/res/values-nl/strings.xml
	DeviceSettings/res/values-pt-rBR/arrays.xml
	DeviceSettings/res/values-pt-rBR/strings.xml
	DeviceSettings/res/values-zh-rCN/arrays.xml
	DeviceSettings/res/values/arrays.xml
	DeviceSettings/res/values/config.xml
	DeviceSettings/res/values/strings.xml
	DeviceSettings/res/xml/sensors_preferences.xml
	DeviceSettings/src/com/cyanogenmod/settings/device/DeviceSettings.java
	DeviceSettings/src/com/cyanogenmod/settings/device/SensorsFragmentActivity.java
	DeviceSettings/src/com/cyanogenmod/settings/device/mDNIeMode.java
Build MemTrack HAL

Change-Id: I3096069b1f08799b7871f8fbb50a28c314a4991c
upgrade to motox 4.4 adreno  release

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

Change-Id: Ibe4b3cef46e3daede150925a4608108140872ce1
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