commit 7da2397583445a263fcad23f548951d13cf3b4bb
author Mike Lockwood <lockwood%android.com@gtempaccount.com> Tue Jul 12 11:59:30 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Jul 12 11:59:30 2011 -0700
tree d03600ee4b9639fdf11ef19e3bd96e98ebd68be1
parent 9df11a69e1c7c0a6217f567c6afbc86b4125ed99
parent 0dce7d7e7294c3815594f7e561f8df9a858e0fab

am 0dce7d7e: Merge "Add Gigabyte\'s USB vendor ID to adb."

* commit '0dce7d7e7294c3815594f7e561f8df9a858e0fab':
  Add Gigabyte's USB vendor ID to adb.

adb/usb_vendors.c

diff --git a/adb/usb_vendors.c b/adb/usb_vendors.c
index c09fc71..1ab5100 100644
--- a/adb/usb_vendors.c
+++ b/adb/usb_vendors.c
@@ -89,6 +89,8 @@
 #define VENDOR_ID_TI            0x0451
 // Funai's USB Vendor ID
 #define VENDOR_ID_FUNAI         0x0F1C
+// Gigabyte's USB Vendor ID
+#define VENDOR_ID_GIGABYTE      0x0414
 
 
 /** built-in vendor list */
@@ -120,6 +122,7 @@
     VENDOR_ID_PHILIPS,
     VENDOR_ID_TI,
     VENDOR_ID_FUNAI,
+    VENDOR_ID_GIGABYTE,
 };
 
 #define BUILT_IN_VENDOR_COUNT    (sizeof(builtInVendorIds)/sizeof(builtInVendorIds[0]))