Android USB driver: support 4EE7 (Nexus adb only). DO NOT MERGE.

Bug: b/14988808

(cherry picked from commit 700c6fd81dc6501df4cf7eb4ba399ecc021f67c8)

Change-Id: I222a1858f6e46fa947e5b6ad9c48a7126d66ec70
diff --git a/host/windows/usb/android_winusb.inf b/host/windows/usb/android_winusb.inf
index 6c2d525..d12ba27 100755
--- a/host/windows/usb/android_winusb.inf
+++ b/host/windows/usb/android_winusb.inf
@@ -6,7 +6,7 @@
 Class               = AndroidUsbDeviceClass

 ClassGuid           = {3F966BD9-FA04-4ec5-991C-D326973B5128}

 Provider            = %ProviderName%

-DriverVer           = 01/27/2014,9.0.0000.00000

+DriverVer           = 06/06/2014,10.0.0000.00000

 CatalogFile.NTx86   = androidwinusb86.cat

 CatalogFile.NTamd64 = androidwinusba64.cat

 

@@ -50,6 +50,7 @@
 %CompositeAdbInterface%     = USB_Install, USB\VID_18D1&PID_4EE2&MI_01

 %CompositeAdbInterface%     = USB_Install, USB\VID_18D1&PID_4EE4&MI_02

 %CompositeAdbInterface%     = USB_Install, USB\VID_18D1&PID_4EE6&MI_01

+%CompositeAdbInterface%     = USB_Install, USB\VID_18D1&PID_4EE7

 

 ;Google Glass

 %SingleAdbInterface%        = USB_Install, USB\VID_18D1&PID_9001

@@ -84,6 +85,7 @@
 %CompositeAdbInterface%     = USB_Install, USB\VID_18D1&PID_4EE2&MI_01

 %CompositeAdbInterface%     = USB_Install, USB\VID_18D1&PID_4EE4&MI_02

 %CompositeAdbInterface%     = USB_Install, USB\VID_18D1&PID_4EE6&MI_01

+%CompositeAdbInterface%     = USB_Install, USB\VID_18D1&PID_4EE7

 

 ;Google Glass

 %SingleAdbInterface%        = USB_Install, USB\VID_18D1&PID_9001

diff --git a/sdk/usbdriver_source.properties b/sdk/usbdriver_source.properties
index 5a0875c..d68d7c2 100755
--- a/sdk/usbdriver_source.properties
+++ b/sdk/usbdriver_source.properties
@@ -1,3 +1,3 @@
-Pkg.Revision=9

+Pkg.Revision=10

 Archive.HostOs=WINDOWS

 Extra.Path=usb_driver