Merge branch 'kk' of https://github.com/SimpleAOSP/android_frameworks_base into kk
Merge branch 'kk' of github.com:SimpleAOSP/android_frameworks_base into kk