Ownify The ROM
Merge branch 'android-4.4' of https://github.com/OwnROM/android_packages_apps_Settings into android-4.4

Conflicts:
	AndroidManifest.xml
	res/drawable-hdpi/ic_settings_about.png
	res/drawable-hdpi/ic_settings_accessibility.png
	res/drawable-hdpi/ic_settings_advanced.png
	res/drawable-hdpi/ic_settings_date_time.png
	res/drawable-hdpi/ic_settings_language.png
	res/drawable-hdpi/ic_settings_sound.png
	res/drawable-hdpi/ic_settings_supersu.png
	res/drawable-hdpi/ic_settings_sync.png
	res/drawable-hdpi/stat_sys_phone_call.png
	res/drawable-ldrtl-hdpi/ic_settings_language.png
	res/drawable-ldrtl-hdpi/ic_settings_sound.png
	res/drawable-ldrtl-hdpi/stat_sys_phone_call.png
	res/drawable-ldrtl-mdpi/ic_emergency.png
	res/drawable-mdpi/dotted_line_480px.png
	res/drawable-mdpi/ic_emergency.png
	res/drawable-mdpi/ic_power_system.png
	res/drawable-mdpi/ic_settings_accessibility.png
	res/drawable-mdpi/ic_settings_advanced.png
	res/drawable-mdpi/ic_settings_supersu.png
	res/drawable-xhdpi/ic_settings_advanced.png
	res/drawable-xhdpi/ic_settings_supersu.png
	res/layout/bluetooth_device_picker.xml
	res/layout/keyguard_appwidget_item.xml
	res/layout/manage_applications_item.xml
	res/layout/pick_item.xml
	res/layout/regulatory_info.xml
	res/layout/sms_preference_item.xml
	res/layout/two_buttons_panel.xml
	res/layout/usage_stats.xml
	res/layout/usage_stats_item.xml
	res/values-ca/custom_strings.xml
	res/values-cs/custom_strings.xml
	res/values-de/custom_strings.xml
	res/values-el/custom_strings.xml
	res/values-es/custom_strings.xml
	res/values-fr/custom_strings.xml
	res/values-it/custom_strings.xml
	res/values-land/dimens.xml
	res/values-nl/custom_strings.xml
	res/values-pl/custom_strings.xml
	res/values-pt/custom_strings.xml
	res/values-ru/custom_strings.xml
	res/values-sv/custom_strings.xml
	res/values-sw600dp-land/dimens.xml
	res/values-sw600dp/dimens.xml
	res/values-xlarge/dimens.xml
	res/values-zh-rCN/custom_strings.xml
	res/values/config.xml
	res/values/custom_arrays.xml
	res/values/custom_strings.xml
	res/values/dimens.xml
	res/values/strings.xml
	res/xml/device_info_settings.xml
	res/xml/settings_headers.xml
	src/com/android/settings/UsageStats.java
	src/com/android/settings/bluetooth/A2dpProfile.java
	src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java
	src/com/android/settings/bluetooth/BluetoothEventManager.java
	src/com/android/settings/bluetooth/BluetoothPairingDialog.java
	src/com/android/settings/bluetooth/BluetoothPermissionActivity.java
	src/com/android/settings/bluetooth/BluetoothSettings.java
	src/com/android/settings/bluetooth/CachedBluetoothDevice.java
	src/com/android/settings/bluetooth/CachedBluetoothDeviceManager.java
	src/com/android/settings/bluetooth/DeviceProfilesSettings.java
	src/com/android/settings/bluetooth/HeadsetProfile.java
	src/com/android/settings/bluetooth/HidProfile.java
	src/com/android/settings/bluetooth/LocalBluetoothProfile.java
	src/com/android/settings/bluetooth/OppProfile.java
	src/com/android/settings/bluetooth/PanProfile.java
	src/com/android/settings/bluetooth/PbapServerProfile.java
	src/com/android/settings/bluetooth/Utils.java
	src/com/android/settings/wfd/WifiDisplaySettings.java
	tests/res/drawable-hdpi/ic_settings_applications.png
	tests/res/drawable-mdpi/ic_settings_applications.png

Ownify the ROM