Merge remote-tracking branch 'PA-base/kitkat' into kitkat-remix
Merge branch 'kitkat' of github.com:AOSPA/android_frameworks_base into kitkat-remix

Conflicts:
	core/java/android/provider/Settings.java
	core/res/res/values/pa_symbols.xml
	packages/SystemUI/res/values/pa_strings.xml
	packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsModel.java
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
Merge branch 'kitkat-remix' of github.com:AOSPAL/android_frameworks_base into kitkat-remix
Merge branch 'kitkat' of github.com:AOSPA/android_frameworks_base into kitkat-remix
Merge branch 'kitkat' of github.com:AOSPA/android_frameworks_base into kitkat-remix

Conflicts:
	core/res/res/values-es/pa_strings.xml
	core/res/res/values/pa_strings.xml
	services/java/com/android/server/NotificationManagerService.java
Merge branch 'kitkat-remix' of https://github.com/AOSPAL/android_frameworks_base into HEAD

Conflicts:
	core/res/res/values/pa_strings.xml
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
Revert this for now as it stops the build for me

Revert "Support GESTURE_SENSOR input device type with GestureService"

This reverts commit f4b4aa7c0cd1198d40e1f71bdab6e87f314ffcfe.

Conflicts:

	core/res/res/values/symbols.xml
	services/java/com/android/server/SystemServer.java
Merge branch 'remix-legacy' of https://github.com/AOSPAL/android_frameworks_base into remix-legacy

Conflicts:
	core/res/res/values-es/pa_strings.xml
	core/res/res/values/pa_strings.xml
	packages/SystemUI/res/values/pa_strings.xml
	packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
	services/java/com/android/server/NotificationManagerService.java