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

Conflicts:
	core/java/android/provider/Settings.java

Change-Id: I4b695a1383596f4463fa4e62d36cd810194db306