commit 9df11a69e1c7c0a6217f567c6afbc86b4125ed99
author Mike Lockwood <lockwood%android.com@gtempaccount.com> Tue Jul 12 11:59:28 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Jul 12 11:59:28 2011 -0700
tree 1614471f7842d9bfa6fe08b2b175092d72bfaad9
parent 202729a0c1d966345dcbfa21db7d886b5d1e6200
parent 161fca79a9b79ed15d009fc71a916bf1a3b62621

am 161fca79: Merge "Add Funai\'s USB vendor ID to adb."

* commit '161fca79a9b79ed15d009fc71a916bf1a3b62621':
  Add Funai's USB vendor ID to adb.

adb/usb_vendors.c

diff --git a/adb/usb_vendors.c b/adb/usb_vendors.c
index d642566..c09fc71 100644
--- a/adb/usb_vendors.c
+++ b/adb/usb_vendors.c
@@ -87,6 +87,8 @@
 #define VENDOR_ID_PHILIPS       0x0471
 // Texas Instruments's USB Vendor ID
 #define VENDOR_ID_TI            0x0451
+// Funai's USB Vendor ID
+#define VENDOR_ID_FUNAI         0x0F1C
 
 
 /** built-in vendor list */
@@ -117,6 +119,7 @@
     VENDOR_ID_ASUS,
     VENDOR_ID_PHILIPS,
     VENDOR_ID_TI,
+    VENDOR_ID_FUNAI,
 };
 
 #define BUILT_IN_VENDOR_COUNT    (sizeof(builtInVendorIds)/sizeof(builtInVendorIds[0]))