Merge branch 'cm-10.1' of github.com:CyanogenMod/android_device_samsung_smdk4412-common into cm-10.1
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1