Build V6
Merge branch 'cm-11.0' of git://github.com/CyanogenMod/android_packages_apps_Settings into cm-11.0

Conflicts:
	res/values/cm_strings.xml
	res/xml/settings_headers.xml
Settings: Clear Recents position - 1/2