Merge branch 'cm-10.1' of https://github.com/CyanogenMod/android_device_samsung_quincy-common into bigfoot2

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