Merge branch 'cm-10.2' of github.com:CyanogenMod/android_vendor_cm into cm-10.2

Conflicts:
	config/common.mk

Change-Id: Ia2c2b5d60cceaf35ea6d2be194a97db1fe600bc4
Merge branch 'cm-10.2' of github.com:CyanogenMod/android_vendor_cm into cm-10.2
Merge branch 'DerTeufel/cm-10.2'

Conflicts:
	config/common.mk