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

Conflicts:
	packages/Keyguard/src/com/android/keyguard/KeyguardViewManager.java

Change-Id: I6012dce563c299d1ca42537f2940d29c6428f788