commit 9ac7fb7d61dd2633b09de88af47e904067a6fd7c
author Takeshi Kishimoto <kishimoto@google.com> Fri Jun 18 10:36:46 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Jun 18 10:36:46 2010 -0700
tree 6b74b091a4f18a683c6e04b6ef2b3a378bbeed9e
parent 5f81c272c18a0ef8b5e6e56f1528dd46db310d0d
parent f1792b3d125a6adefa6941d20b3f26833570ab65

am f1792b3d: am 2124afee: Added NEC and PMC\'s USB VIDs upon their request.

Merge commit 'f1792b3d125a6adefa6941d20b3f26833570ab65'

* commit 'f1792b3d125a6adefa6941d20b3f26833570ab65':
  Added NEC and PMC's USB VIDs upon their request.

adb/usb_vendors.c

diff --git a/adb/usb_vendors.c b/adb/usb_vendors.c
index 6d85fb1..9e1600f 100644
--- a/adb/usb_vendors.c
+++ b/adb/usb_vendors.c
@@ -69,6 +69,10 @@
 #define VENDOR_ID_PANTECH       0x10A9
 // Qualcomm's USB Vendor ID
 #define VENDOR_ID_QUALCOMM      0x05c6
+// NEC's USB Vendor ID
+#define VENDOR_ID_NEC           0x0409
+// Panasonic Mobile Communication's USB Vendor ID
+#define VENDOR_ID_PMC           0x04DA
 
 
 /** built-in vendor list */
@@ -90,6 +94,8 @@
     VENDOR_ID_KYOCERA,
     VENDOR_ID_PANTECH,
     VENDOR_ID_QUALCOMM,
+    VENDOR_ID_NEC,
+    VENDOR_ID_PMC,
 };
 
 #define BUILT_IN_VENDOR_COUNT    (sizeof(builtInVendorIds)/sizeof(builtInVendorIds[0]))