usccnote3
Merge branch 'master' of https://github.com/tommymontana/android_device_samsung_hlte-common

Conflicts:
	Android.mk
	audio/mixer_paths.xml
	setup-makefiles.sh