Merge remote-tracking branch 'cm/cm-10.1' into jb-4.2
Merge branch 'jb-4.2' of github.com:TeamBAKED/device_samsung_smdk4412-common into jb-4.2