Merge branch 'kitkat' of https://github.com/AOSPA/android_frameworks_base into kitkat
Merge remote-tracking branch 'legacy/kitkat' into kitkat