Merge github.com:ezeteze/android_device_huawei_u8800

Conflicts:
	Android.mk
	AndroidBoard.mk
	AndroidProducts.mk
	BoardConfig.mk
	UsbController.cpp
	X5settings/Android.mk
	X5settings/AndroidManifest.xml
	X5settings/default.properties
	X5settings/proguard.cfg
	X5settings/res/drawable-hdpi/ic_menu_about.png
	X5settings/res/drawable-hdpi/ic_menu_quit.png
	X5settings/res/drawable-hdpi/icon.png
	X5settings/res/drawable-ldpi/icon.png
	X5settings/res/drawable-mdpi/icon.png
	X5settings/res/layout/about.xml
	X5settings/res/layout/haptic.xml
	X5settings/res/layout/io.xml
	X5settings/res/layout/led.xml
	X5settings/res/layout/main.xml
	X5settings/res/layout/misc.xml
	X5settings/res/layout/sound.xml
	X5settings/res/layout/touchscreen.xml
	X5settings/res/layout/vdd.xml
	X5settings/res/layout/vold.xml
	X5settings/res/values-pt/strings.xml
	X5settings/res/values-zh/strings.xml
	X5settings/res/values/strings.xml
	X5settings/src/com/ideos/x5settings/About.java
	X5settings/src/com/ideos/x5settings/Haptic.java
	X5settings/src/com/ideos/x5settings/Io.java
	X5settings/src/com/ideos/x5settings/Led.java
	X5settings/src/com/ideos/x5settings/Misc.java
	X5settings/src/com/ideos/x5settings/Rootcommands.java
	X5settings/src/com/ideos/x5settings/Sound.java
	X5settings/src/com/ideos/x5settings/Touchscreen.java
	X5settings/src/com/ideos/x5settings/Vdd.java
	X5settings/src/com/ideos/x5settings/X5settings.java
	device_u8800.mk
	dhcpcd.conf
	egl.cfg
	firmware/vidc_720p_command_control.fw
	firmware/vidc_720p_h263_dec_mc.fw
	firmware/vidc_720p_h264_dec_mc.fw
	firmware/vidc_720p_h264_enc_mc.fw
	firmware/vidc_720p_mp2_dec_mc.fw
	firmware/vidc_720p_mp4_dec_mc.fw
	firmware/vidc_720p_mp4_enc_mc.fw
	firmware/vidc_720p_vc1_dec_mc.fw
	firmware/wlan/hostapd_default.conf
	init.qcom.bt.sh
	init.qcom.fm.sh
	init.u8800.rc
	kernel
	libaudio/Android.mk
	libaudio/AudioHardware.cpp
	libaudio/AudioHardware.h
	libaudio/AudioPolicyManager.cpp
	libaudio/AudioPolicyManager.h
	libaudio/alsa.c
	libaudio/asound.h
	libaudio/control.h
	libaudio/msm_audio.h
	libaudio/msm_audio_aac.h
	libaudio/msm_audio_amrnb.h
	libcamera/Android.mk
	libcamera/MODULE_LICENSE_BSD
	libcamera/QualcommCameraHardware.cpp
	libcamera/QualcommCameraHardware.h
	libcamera/msm_camera.h
	libgralloc/Android.mk
	libgralloc/Android.mk~
	libgralloc/MODULE_LICENSE_APACHE2
	libgralloc/NOTICE
	libgralloc/allocator.cpp
	libgralloc/allocator.h
	libgralloc/framebuffer.cpp
	libgralloc/gpu.cpp
	libgralloc/gpu.h
	libgralloc/gr.h
	libgralloc/gralloc.cpp
	libgralloc/gralloc_priv.h
	libgralloc/mapper.cpp
	libgralloc/pmemalloc.cpp
	libgralloc/pmemalloc.h
	libgralloc/tests/Android.mk
	libgralloc/tests/pmemalloc_test.cpp
	liblights/Android.mk
	liblights/MODULE_LICENSE_APACHE2
	liblights/NOTICE
	liblights/lights.c
	libril/Android.mk
	libril/MODULE_LICENSE_APACHE2
	libril/NOTICE
	libril/ril.cpp
	libril/ril.h
	libril/ril_commands.h
	libril/ril_event.cpp
	libril/ril_event.h
	libril/ril_unsol_commands.h
	load_libra/Android.mk
	load_libra/load_libra.c
	media_profiles.xml
	overlay/frameworks/base/core/res/res/values/config.xml
	overlay/frameworks/base/core/res/res/xml/power_profile.xml
	overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
	overlay/packages/apps/CMParts/res/values/arrays.xml
	overlay/packages/apps/CMParts/res/values/config.xml
	overlay/packages/apps/Contacts/res/values/config.xml
	overlay/packages/apps/Mms/res/xml/mms_config.xml
	overlay/packages/apps/Phone/res/values/config.xml
	overlay/packages/apps/Settings/res/values-zh-rCN/strings.xml
	overlay/packages/apps/Settings/res/values/strings.xml
	overlay/packages/apps/Settings/res/xml/device_info_settings.xml
	overlay/packages/apps/Settings/res/xml/settings.xml
	qwerty.kl
	recovery.fstab
	recovery.rc
	recovery/offmode/Android.mk
	recovery/offmode/offmode_check.c
	recovery/recovery_ui.c
	recovery/res/images/level0.png
	recovery/res/images/level1.png
	recovery/res/images/level2.png
	recovery/res/images/level3.png
	recovery/res/images/level4.png
	recovery/res/images/level5.png
	recovery/rmt_storage/Android.mk
	recovery/rmt_storage/rmt_storage
	system.prop
	vendorsetup.sh
	wpa_supplicant.conf