Merge branch 'cm-10.2' of git://github.com/CyanogenMod/android_device_samsung_smdk4412-common into cm-10.2

Conflicts:
	common.mk