Merge remote-tracking branch 'upstream/cm-11.0' into ose
Merge branch 'ose' of github.com:Team-OSE/device_samsung_jflte into ose