Merge branch 'CyanogenMod_cm-10.2' into kbc-cyanogen-cm-10.2
[sc03e]update defconfig
Merge remote-tracking branch 'kbc/kbc-cyanogen-cm-10.2' into cm-10.2

Conflicts:
	arch/arm/configs/kbc_sc03e_aosp_defconfig