settings: This is CyanogenMod!

Change-Id: If9f14d6579b18c4ae049d35e312dd2d98746aced
Merge branch 'cm-11.0' into kk_mkt

Conflicts:
	res/xml/device_info_settings.xml

Change-Id: Iea481c35dbdbdf31106580d07b30dd3969b13e96