LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit '4e75b80a' into merge

Browse Source 
Conflicts:
	host/windows/usb/android_winusb.inf

Change-Id: I64a3be958e85302d0a6213d1c46ff9e7214ef352
This commit is contained in:
Raphael
2010-11-08 12:51:51 -08:00
parent 80541cbaf3 4e75b80a4d
commit 2dcfe08b48
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
host/windows/usb/android_winusb.inf
View File

@@ -102,6 +102,9 @@ HKR,,Icon,,-1
; Samsung SHW-M110S ; Samsung SHW-M110S
%SingleAdbInterface% = USB_Install, USB\VID_04E8&PID_681D %SingleAdbInterface% = USB_Install, USB\VID_04E8&PID_681D
%CompositeAdbInterface% = USB_Install, USB\VID_04E8&PID_681D&MI_01 %CompositeAdbInterface% = USB_Install, USB\VID_04E8&PID_681D&MI_01
=======
%CompositeAdbInterface% = USB_Install, USB\VID_413C&PID_B007&MI_01
>>>>>>> 4e75b80a
[USB_Install] [USB_Install]
Include = winusb.inf Include = winusb.inf