MW
Merge branch 'kk44' of https://github.com/sspencer10/frameworks_base-vanir into kk44