commit 2ae9878cd5dc517cc7338aaca81f0eb3127b4a53
author Jean-Baptiste Queru <jbq@google.com> Wed May 02 11:58:10 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed May 02 11:58:10 2012 -0700
tree 224387dee57cbe75af88cf7af30235f024067273
parent f1f0d224c6d4c116eef8ae821e42370ad0fad957
parent c5d5a5e807a99697cff936dcdfe0fbaaf3cb6679

am c5d5a5e8: Merge "Kindle Fire USB ID"

* commit 'c5d5a5e807a99697cff936dcdfe0fbaaf3cb6679':
  Kindle Fire USB ID

adb/usb_vendors.c

diff --git a/adb/usb_vendors.c b/adb/usb_vendors.c
index 5d8a831..a1c3523 100644
--- a/adb/usb_vendors.c
+++ b/adb/usb_vendors.c
@@ -125,6 +125,8 @@
 #define VENDOR_ID_INQ_MOBILE    0x2314
 // Sony's USB Vendor ID
 #define VENDOR_ID_SONY          0x054C
+// Lab126's USB Vendor ID
+#define VENDOR_ID_LAB126        0x1949
 
 /** built-in vendor list */
 int builtInVendorIds[] = {
@@ -173,6 +175,7 @@
     VENDOR_ID_QUANTA,
     VENDOR_ID_INQ_MOBILE,
     VENDOR_ID_SONY,
+    VENDOR_ID_LAB126,
 };
 
 #define BUILT_IN_VENDOR_COUNT    (sizeof(builtInVendorIds)/sizeof(builtInVendorIds[0]))