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