Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_device_sony_huashan into CyanogenMod-cm-11.0

Conflicts:
	cpa.dependencies
	overlay/frameworks/base/packages/SystemUI/res/values/config.xml
Merge branch 'CyanogenMod-cm-11.0' into kitkat