Merge branch 'cm-10.1' of https://github.com/CyanogenMod/android_device_samsung_jf-common into cm-10.1

Conflicts:
	Android.mk
Merge branch 'cm-10.1' of github.com:kbc-developers/android_device_samsung_jf-common into cm-10.1