commit 190cabb376d9a393b65a0d8c123196bf58ef7ab4
author Raphael <raphael@google.com> Mon Feb 01 15:34:16 2010 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Feb 01 15:34:16 2010 -0800
tree f925541076145d1aab116f29d4409ff5b6540e52
parent 20f410a41890113de126680518c13cdab359c66d
parent 1873adc2b12d5a9045bae90650bb331c7c7aa3c7

am 1873adc2: ADB: Garmin-Asus\'s USB Vendor ID

Merge commit '1873adc2b12d5a9045bae90650bb331c7c7aa3c7' into eclair-plus-aosp

* commit '1873adc2b12d5a9045bae90650bb331c7c7aa3c7':
  ADB: Garmin-Asus's USB Vendor ID

adb/usb_vendors.c

diff --git a/adb/usb_vendors.c b/adb/usb_vendors.c
index 203c006..9b8c972 100644
--- a/adb/usb_vendors.c
+++ b/adb/usb_vendors.c
@@ -55,6 +55,8 @@
 #define VENDOR_ID_FOXCONN       0x0489
 // Dell's USB Vendor ID
 #define VENDOR_ID_DELL          0x413c
+// Garmin-Asus's USB Vendor ID
+#define VENDOR_ID_GARMIN_ASUS   0x091E
 
 
 /** built-in vendor list */
@@ -69,6 +71,7 @@
     VENDOR_ID_SONY_ERICSSON,
     VENDOR_ID_FOXCONN,
     VENDOR_ID_DELL,
+    VENDOR_ID_GARMIN_ASUS,
 };
 
 #define BUILT_IN_VENDOR_COUNT    (sizeof(builtInVendorIds)/sizeof(builtInVendorIds[0]))