advancing to working state...
Merge branch 'cm-11.0' of https://github.com/kibuuka/device_dell_msm8660-common into cm-11.0

Conflicts:
	Android.mk
	BoardConfigCommon.mk
	camerawrapper/CameraWrapper.cpp
	common-proprietary-files.txt
	include/linux/msm_audio_amrnb.h
	include/linux/msm_audio_mvs.h
	include/linux/msm_audio_qcp.h
	include/linux/msm_audio_sbc.h
	include/linux/msm_audio_wma.h
	include/linux/msm_audio_wmapro.h
	include/media/msm_camera.h
	proprietary-files.txt