Update 1
asound.conf modified
Merge branch 'cm10' of https://github.com/kaschemme/android_vendor_ideapad_k1 into cm10

Conflicts:
	gps.conf
repacked vendor files