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

Conflicts:
	core/java/android/provider/Settings.java
	core/res/res/values-es/pa_strings.xml
	core/res/res/values/pa_strings.xml
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
	services/java/com/android/server/NotificationManagerService.java