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

Conflicts:
	device.mk

Change-Id: Ib5834986ecb500849eb9222eb0b8031f873ff3d1