Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_device_samsung_smdk4412-common.git into cm-11.0
Merge remote-tracking branch 'kbc/cm-11.0' into cm-11.0