Merge branch 'cm-11.0' of https://github.com/TeamCanjica/android_device_samsung_janice into HEAD