am ec30731d: am 2276398d: Merge change I0d9344aa into eclair

Merge commit 'ec30731d8f415a427f15280bdc14ea6c54f5904d' into eclair-mr2-plus-aosp

* commit 'ec30731d8f415a427f15280bdc14ea6c54f5904d':
  Fixed
This commit is contained in:
vchtchetkine
2009-12-13 12:32:03 -08:00
committed by Android Git Automerger

View File

@@ -34,11 +34,14 @@ HKR,,Icon,,-1
%CompositeAdbInterface% = USB_Install, USB\VID_0BB4&PID_0C03&MI_01
;
;Moto Sholes
%SingleBootLoaderInterface% = USB_Install, USB\VID_18D1&PID_D00D
%SingleAdbInterface% = USB_Install, USB\VID_18D1&PID_0002
%CompositeAdbInterface% = USB_Install, USB\VID_18D1&PID_0002&MI_01
%SingleAdbInterface% = USB_Install, USB\VID_22B8&PID_41DB
%CompositeAdbInterface% = USB_Install, USB\VID_22B8&PID_41DB&MI_01
;
;Google NexusOne
%SingleAdbInterface% = USB_Install, USB\VID_18D1&PID_0D02
%CompositeAdbInterface% = USB_Install, USB\VID_18D1&PID_0D02&MI_01
%SingleAdbInterface% = USB_Install, USB\VID_18D1&PID_4E11
%CompositeAdbInterface% = USB_Install, USB\VID_18D1&PID_4E12&MI_01
[Google.NTamd64]
; HTC Dream
@@ -49,11 +52,14 @@ HKR,,Icon,,-1
%CompositeAdbInterface% = USB_Install, USB\VID_0BB4&PID_0C03&MI_01
;
;Moto Sholes
%SingleBootLoaderInterface% = USB_Install, USB\VID_18D1&PID_D00D
%SingleAdbInterface% = USB_Install, USB\VID_18D1&PID_0002
%CompositeAdbInterface% = USB_Install, USB\VID_18D1&PID_0002&MI_01
%SingleAdbInterface% = USB_Install, USB\VID_22B8&PID_41DB
%CompositeAdbInterface% = USB_Install, USB\VID_22B8&PID_41DB&MI_01
;
;Google NexusOne
%SingleAdbInterface% = USB_Install, USB\VID_18D1&PID_0D02
%CompositeAdbInterface% = USB_Install, USB\VID_18D1&PID_0D02&MI_01
%SingleAdbInterface% = USB_Install, USB\VID_18D1&PID_4E11
%CompositeAdbInterface% = USB_Install, USB\VID_18D1&PID_4E12&MI_01
[USB_Install]
Include = winusb.inf