d2/jf/hlte - consolidation
Merge pull request #407 from invisiblek/consolidation

d2/jf/hlte - consolidation
Merge branch 'cm-11.0' of github.com:TheMuppets/proprietary_vendor_samsung into cm-11.0