Total reboot
Merge branch 'cm-10.1' of https://github.com/mcgi5sr2/android_device_htc_primou into cm-10.1

Conflicts:
	AndroidBoard.mk
	AndroidProducts.mk
	BoardConfig.mk
	CleanSpec.mk
	README
	cm.mk
	device.mk
	extract-files.sh
	liblights/Android.mk
	liblights/MODULE_LICENSE_APACHE2
	liblights/NOTICE
	liblights/lights.c
	libsensors/AkmSensor.cpp
	libsensors/AkmSensor.h
	libsensors/Android.mk
	libsensors/InputEventReader.cpp
	libsensors/InputEventReader.h
	libsensors/LightSensor.cpp
	libsensors/LightSensor.h
	libsensors/MODULE_LICENSE_APACHE2
	libsensors/NOTICE
	libsensors/ProximitySensor.cpp
	libsensors/ProximitySensor.h
	libsensors/SensorBase.cpp
	libsensors/SensorBase.h
	libsensors/nusensors.cpp
	libsensors/nusensors.h
	libsensors/sensors.c
	media_a1026.mk
	media_htcaudio.mk
	overlay/frameworks/base/core/res/res/values/config.xml
	overlay/frameworks/base/core/res/res/xml/eri.xml
	overlay/frameworks/base/core/res/res/xml/power_profile.xml
	overlay/frameworks/base/core/res/res/xml/storage_list.xml
	overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
	overlay/frameworks/base/packages/SystemUI/res/values/config.xml
	overlay/frameworks/base/tests/ImfTest/res/values/config.xml
	overlay/packages/apps/Camera/res/values/config.xml
	overlay/packages/apps/Mms/res/xml/mms_config.xml
	overlay/packages/apps/Phone/res/values/config.xml
	overlay/packages/apps/Torch/res/values/config.xml
	prebuilt/etc/audio_policy.conf
	prebuilt/etc/gps.conf
	prebuilt/etc/media_codecs.xml
	prebuilt/etc/media_profiles.xml
	prebuilt/etc/vold.fstab
	prebuilt/root/kernel
	prebuilt/usr/idc/qwerty.idc
	prebuilt/usr/idc/qwerty2.idc
	prebuilt/usr/idc/synaptics-rmi-touchscreen.idc
	prebuilt/usr/keychars/Generic.kcm
	prebuilt/usr/keychars/Virtual.kcm
	prebuilt/usr/keychars/qwerty.kcm
	prebuilt/usr/keychars/qwerty2.kcm
	prebuilt/usr/keylayout/AVRCP.kl
	prebuilt/usr/keylayout/h2w_headset.kl
	prebuilt/usr/keylayout/qwerty.kl
	prebuilt/usr/keylayout/synaptics-rmi-touchscreen.kl
	recovery.fstab
	setup-makefiles.sh
	system.prop
	vendorsetup.sh