Merge commit '4e75b80a' into merge

Conflicts:
	host/windows/usb/android_winusb.inf

Change-Id: I64a3be958e85302d0a6213d1c46ff9e7214ef352

diff --cc host/windows/usb/android_winusb.inf
index 331ed6d,093c6de..63b4bea
--- 1/host/windows/usb/android_winusb.inf
--- 2/host/windows/usb/android_winusb.inf
+++ b/host/windows/usb/android_winusb.inf
@@@ -84,24 -67,7 +84,27 @@@ HKR,,Icon,,-
  %CompositeAdbInterface%     = USB_Install, USB\VID_18D1&PID_4E22&MI_01\r
  ;\r
  ; Dell's Mini5\r
 +%SingleAdbInterface%        = USB_Install, USB\VID_413C&PID_B007\r
 +%CompositeAdbInterface%     = USB_Install, USB\VID_413C&PID_B007&MI_01\r
 +;\r
 +; Samsung SPH-M900, GT-I5700, SCH-R880\r
 +%SingleAdbInterface%        = USB_Install, USB\VID_04E8&PID_681C\r
 +%CompositeAdbInterface%     = USB_Install, USB\VID_04E8&PID_681C&MI_01\r
 +; Samsung GT-I7500\r
 +%SingleAdbInterface%        = USB_Install, USB\VID_04E8&PID_6601\r
 +%CompositeAdbInterface%     = USB_Install, USB\VID_04E8&PID_6601&MI_01\r
 +; Samsung GT-I5500\r
 +%SingleAdbInterface%        = USB_Install, USB\VID_04E8&PID_6882\r
 +%CompositeAdbInterface%     = USB_Install, USB\VID_04E8&PID_6882&MI_01\r
 +; Samsung SHW-M100S\r
 +%SingleAdbInterface%        = USB_Install, USB\VID_04E8&PID_6850\r
 +%CompositeAdbInterface%     = USB_Install, USB\VID_04E8&PID_6850&MI_01\r
 +; Samsung SHW-M110S\r
 +%SingleAdbInterface%        = USB_Install, USB\VID_04E8&PID_681D\r
 +%CompositeAdbInterface%     = USB_Install, USB\VID_04E8&PID_681D&MI_01\r
++=======\r
+ %CompositeAdbInterface%     = USB_Install, USB\VID_413C&PID_B007&MI_01\r
++>>>>>>> 4e75b80a\r
  \r
  [USB_Install]\r
  Include = winusb.inf\r