Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_device_samsung_d2lte into kk-4.4

Conflicts:
	overlay/frameworks/base/core/res/res/values/config.xml