commit 007b70023b179f846c0ad1f0303da4ce03ac065e
author Jean-Baptiste Queru <jbq@google.com> Wed May 02 15:11:08 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed May 02 15:11:08 2012 -0700
tree ba9bca6d4ffa54e4c8583e99a1521665e37c4eea
parent eed821e952e45d680557f71da180dc86c9ea92e1
parent 2ae9878cd5dc517cc7338aaca81f0eb3127b4a53

am 2ae9878c: am c5d5a5e8: Merge "Kindle Fire USB ID"

* commit '2ae9878cd5dc517cc7338aaca81f0eb3127b4a53':
  Kindle Fire USB ID

adb/usb_vendors.c

diff --git a/adb/usb_vendors.c b/adb/usb_vendors.c
index a477e4e..f5aa8cc 100644
--- a/adb/usb_vendors.c
+++ b/adb/usb_vendors.c
@@ -123,6 +123,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[] = {
@@ -170,6 +172,7 @@
     VENDOR_ID_QUANTA,
     VENDOR_ID_INQ_MOBILE,
     VENDOR_ID_SONY,
+    VENDOR_ID_LAB126,
 };
 
 #define BUILT_IN_VENDOR_COUNT    (sizeof(builtInVendorIds)/sizeof(builtInVendorIds[0]))