commit 5ca7509f5b188231666973a66566e6de2e3d48db
author Xavier Ducrohet <xav@android.com> Sat Oct 16 09:43:26 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Sat Oct 16 09:43:26 2010 -0700
tree 4a37ea7d5454d7f0f84a5d0a7c9df72e6322f68e
parent de58105fad20e26c2997eec30a8dfebeacf28e32
parent fa5c690d93b92ccf57a0522c498ca2076a7ad98d

am fa5c690d: am 89aff1d2: Add Asus USB vendor ID to adb.

Merge commit 'fa5c690d93b92ccf57a0522c498ca2076a7ad98d'

* commit 'fa5c690d93b92ccf57a0522c498ca2076a7ad98d':
  Add Asus USB vendor ID to adb.

adb/usb_vendors.c

diff --git a/adb/usb_vendors.c b/adb/usb_vendors.c
index bebac2d..deb2ec8 100644
--- a/adb/usb_vendors.c
+++ b/adb/usb_vendors.c
@@ -81,6 +81,8 @@
 #define VENDOR_ID_SK_TELESYS    0x1F53
 // KT Tech's USB Vendor ID
 #define VENDOR_ID_KT_TECH       0x2116
+// Asus's USB Vendor ID
+#define VENDOR_ID_ASUS          0x0b05
 
 
 /** built-in vendor list */
@@ -108,6 +110,7 @@
     VENDOR_ID_TOSHIBA,
     VENDOR_ID_SK_TELESYS,
     VENDOR_ID_KT_TECH,
+    VENDOR_ID_ASUS,
 };
 
 #define BUILT_IN_VENDOR_COUNT    (sizeof(builtInVendorIds)/sizeof(builtInVendorIds[0]))