Merge branch 'kitkat' of https://github.com/AOSPA/android_frameworks_base into kitkat

Conflicts:
	Android.mk
	cmds/bootanimation/BootAnimation.cpp
	core/java/android/provider/Settings.java
	core/java/android/service/gesture/EdgeGestureManager.java
	core/java/android/service/gesture/IEdgeGestureService.aidl
	core/java/com/android/internal/os/ZygoteConnection.java
	core/java/com/android/internal/util/gesture/EdgeServiceConstants.java
	core/res/AndroidManifest.xml
	core/res/res/values/config.xml
	core/res/res/values/dimens.xml
	core/res/res/values/symbols.xml
	packages/Keyguard/src/com/android/keyguard/KeyguardViewManager.java
	packages/SettingsProvider/res/values/defaults.xml
	packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	packages/WallpaperCropper/src/com/android/wallpapercropper/WallpaperCropActivity.java
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
	services/java/com/android/server/SystemServer.java
	services/java/com/android/server/WallpaperManagerService.java
	services/java/com/android/server/gesture/EdgeGestureInputFilter.java
	services/java/com/android/server/gesture/EdgeGestureService.java
	services/java/com/android/server/gesture/EdgeGestureTracker.java
	services/java/com/android/server/power/DisplayPowerController.java
	services/java/com/android/server/wm/WindowManagerService.java
	telephony/java/android/telephony/PhoneStateListener.java

Change-Id: I92ac2cfddb164c1df8cf16bdc85496ee3533a486