really, really pointless commit, ignore it
Merge branch 'cm-11.0' of github.com:NovaFusion/android_device_samsung_golden into cm-11.0