Merge branch 'kk-4.4' of https://github.com/TheSchismROM/android_frameworks_base into kk-4.4
Merge branch 'kk-4.4' of https://github.com/TheSchismROM/android_frameworks_base into kk-4.4