Merge branch 'cm-12.0' of git://github.com/TheMuppets/proprietary_vendor_samsung into cm-12.0
Merge remote-tracking branch 'upstream/cm-12.0' into cm-12.0