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

Conflicts:
	Android.mk

Change-Id: I0150d275c54ba8482ef61807225cff21ab77cc89
Merge branch 'cm-10.1' of git://github.com/kbc-developers/android_device_samsung_d2-common into cm-10.1