Merge branch 'cm-11.0' of github.com:TheMuppets/proprietary_vendor_samsung into cm-11.0
Merge branch 'cm-11.0' of https://github.com/kbc-developers/proprietary_vendor_samsung into cm-11.0