aboutsummaryrefslogtreecommitdiffstats
path: root/adb
diff options
context:
space:
mode:
authorRaphael <raphael@google.com>2010-02-01 15:34:16 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-02-01 15:34:16 -0800
commit190cabb376d9a393b65a0d8c123196bf58ef7ab4 (patch)
treef925541076145d1aab116f29d4409ff5b6540e52 /adb
parent20f410a41890113de126680518c13cdab359c66d (diff)
parent1873adc2b12d5a9045bae90650bb331c7c7aa3c7 (diff)
downloadsystem_core-190cabb376d9a393b65a0d8c123196bf58ef7ab4.tar.gz
system_core-190cabb376d9a393b65a0d8c123196bf58ef7ab4.tar.bz2
system_core-190cabb376d9a393b65a0d8c123196bf58ef7ab4.zip
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
Diffstat (limited to 'adb')
-rw-r--r--adb/usb_vendors.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/adb/usb_vendors.c b/adb/usb_vendors.c
index 203c006b..9b8c9720 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 @@ int builtInVendorIds[] = {
VENDOR_ID_SONY_ERICSSON,
VENDOR_ID_FOXCONN,
VENDOR_ID_DELL,
+ VENDOR_ID_GARMIN_ASUS,
};
#define BUILT_IN_VENDOR_COUNT (sizeof(builtInVendorIds)/sizeof(builtInVendorIds[0]))