new file:   AndroidBoard.mk
	new file:   AndroidProducts.mk
	new file:   BoardConfig.mk
	new file:   CleanSpec.mk
	new file:   README
	new file:   cm.mk
	new file:   device.mk
	new file:   extract-files.sh
	new file:   full_primou.mk
	new file:   liblights/Android.mk
	new file:   liblights/Android.mk~
	new file:   liblights/MODULE_LICENSE_APACHE2
	new file:   liblights/NOTICE
	new file:   liblights/lights.c
	new file:   liblights/lights.c~
	new file:   libsensors/AkmSensor.cpp
	new file:   libsensors/AkmSensor.h
	new file:   libsensors/Android.mk
	new file:   libsensors/InputEventReader.cpp
	new file:   libsensors/InputEventReader.h
	new file:   libsensors/LightSensor.cpp
	new file:   libsensors/LightSensor.h
	new file:   libsensors/MODULE_LICENSE_APACHE2
	new file:   libsensors/NOTICE
	new file:   libsensors/ProximitySensor.cpp
	new file:   libsensors/ProximitySensor.h
	new file:   libsensors/SensorBase.cpp
	new file:   libsensors/SensorBase.h
	new file:   libsensors/nusensors.cpp
	new file:   libsensors/nusensors.h
	new file:   libsensors/sensors.c
	new file:   media_a1026.mk
	new file:   media_htcaudio.mk
	new file:   overlay/frameworks/base/core/res/res/values/config.xml
	new file:   overlay/frameworks/base/core/res/res/values/config.xml.old
	new file:   overlay/frameworks/base/core/res/res/values/config.xml~
	new file:   overlay/frameworks/base/core/res/res/xml/eri.xml
	new file:   overlay/frameworks/base/core/res/res/xml/power_profile.xml
	new file:   overlay/frameworks/base/core/res/res/xml/power_profile.xml~
	new file:   overlay/frameworks/base/core/res/res/xml/storage_list.xml
	new file:   overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
	new file:   overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml~
	new file:   overlay/frameworks/base/packages/SystemUI/res/values/config.xml
	new file:   overlay/frameworks/base/tests/ImfTest/res/values/config.xml
	new file:   overlay/packages/apps/Mms/res/xml/mms_config.xml
	new file:   overlay/packages/apps/Phone/res/values/config.xml
	new file:   overlay/packages/apps/Settings/res/values/bools.xml
	new file:   overlay/packages/apps/Settings/res/values/config.xml
	new file:   overlay/packages/apps/Torch/res/values/config.xml
	new file:   prebuilt/app/QuickPic.apk
	new file:   prebuilt/etc/audio_policy.conf
	new file:   prebuilt/etc/gps.conf
	new file:   prebuilt/etc/media_codecs.xml
	new file:   prebuilt/etc/media_profiles.xml
	new file:   prebuilt/etc/vold.fstab
	new file:   prebuilt/etc/wpa_supplicant.conf
	new file:   prebuilt/lib/libqpicjni88.so
	new file:   prebuilt/modules/bcmdhd.ko
	new file:   prebuilt/modules/bnep.ko
	new file:   prebuilt/modules/hci_uart.ko
	new file:   prebuilt/modules/hidp.ko
	new file:   prebuilt/modules/rfcomm.ko
	new file:   prebuilt/root/init.primou.rc
	new file:   prebuilt/root/init.rc
	new file:   prebuilt/root/init.usb.rc
	new file:   prebuilt/root/kernel
	new file:   prebuilt/root/ueventd.primou.rc
	new file:   prebuilt/root/ueventd.rc
	new file:   prebuilt/usr/idc/atmel-touchscreen.idc
	new file:   prebuilt/usr/idc/primou-keypad.idc
	new file:   prebuilt/usr/idc/qwerty.idc
	new file:   prebuilt/usr/idc/qwerty2.idc
	new file:   prebuilt/usr/idc/synaptics-rmi-touchscreen.idc
	new file:   prebuilt/usr/keychars/Generic.kcm
	new file:   prebuilt/usr/keychars/Virtual.kcm
	new file:   prebuilt/usr/keychars/qwerty.kcm
	new file:   prebuilt/usr/keychars/qwerty2.kcm
	new file:   prebuilt/usr/keylayout/AVRCP.kl
	new file:   prebuilt/usr/keylayout/atmel-touchscreen.kl
	new file:   prebuilt/usr/keylayout/h2w_headset.kl
	new file:   prebuilt/usr/keylayout/primou-keypad.kl
	new file:   prebuilt/usr/keylayout/qwerty.kl
	new file:   prebuilt/usr/keylayout/synaptics-rmi-touchscreen.kl
	new file:   recovery.fstab
	new file:   setup-makefiles.sh
	new file:   system.prop
	new file:   vendorsetup.sh
Merge https://github.com/Ll0ir/android_device_htc_primou

Conflicts: