commit 31da9db0d1bf3227e3c383aa6ac28bde3c6409e5
author The Android Automerger <android-build@android.com> Tue Nov 06 18:04:30 2012 -0800
committer The Android Automerger <android-build@android.com> Tue Nov 06 18:04:30 2012 -0800
tree bcadb3d6e2a3a174d18bf5df3d1567280b9155c2
parent d1e39491f063626e026304ba8abe084cc43c94da
parent 74365b18c1146a77ecd0938106fd53f38a7e5eda

merge in jb-mr1-release history after reset to jb-mr1-dev

adb/usb_vendors.c

diff --git a/adb/usb_vendors.c b/adb/usb_vendors.c
index d4ddce4..1c09b84 100644
--- a/adb/usb_vendors.c
+++ b/adb/usb_vendors.c
@@ -129,6 +129,9 @@
 #define VENDOR_ID_YULONG_COOLPAD 0x1EBF
 // Kobo's USB Vendor ID
 #define VENDOR_ID_KOBO          0x2237
+// Teleepoch's USB Vendor ID
+#define VENDOR_ID_TELEEPOCH     0x2340
+
 
 /** built-in vendor list */
 int builtInVendorIds[] = {
@@ -179,6 +182,7 @@
     VENDOR_ID_LAB126,
     VENDOR_ID_YULONG_COOLPAD,
     VENDOR_ID_KOBO,
+    VENDOR_ID_TELEEPOCH,
 };
 
 #define BUILT_IN_VENDOR_COUNT    (sizeof(builtInVendorIds)/sizeof(builtInVendorIds[0]))