Tha Menu
Merge branch 'AOSCP-4.4.2' of https://github.com/AOSCP/android_packages_apps_Settings into AOSCP-4.4.2

Conflicts:
	res/values/aoscp_strings.xml
Fix