commit ce10b191c56057e494f6b46de06b0054d77b4726
author Elliott Hughes <enh@google.com> Tue Jun 24 19:38:50 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Jun 24 19:38:50 2014 +0000
tree ccbbe67a5e322108c2137e610e13e3e4153c3438
parent 6bd4588d65977956cadf2e5d384673c64329c8e8
parent f6d86d75461ae3a246522932759e045dcc7a4952

am f6d86d75: am d08b80cc: am 20bda70f: Merge "Add Smartisan usb config"

* commit 'f6d86d75461ae3a246522932759e045dcc7a4952':
  Add Smartisan usb config

adb/usb_vendors.c

diff --git a/adb/usb_vendors.c b/adb/usb_vendors.c
index e7d8268..957e5db 100755
--- a/adb/usb_vendors.c
+++ b/adb/usb_vendors.c
@@ -162,6 +162,8 @@
 #define VENDOR_ID_SHARP         0x04dd
 // SK Telesys's USB Vendor ID
 #define VENDOR_ID_SK_TELESYS    0x1F53
+// Smartisan's USB Vendor ID
+#define VENDOR_ID_SMARTISAN     0x29a9
 // Sony's USB Vendor ID
 #define VENDOR_ID_SONY          0x054C
 // Sony Ericsson's USB Vendor ID
@@ -258,6 +260,7 @@
     VENDOR_ID_SAMSUNG,
     VENDOR_ID_SHARP,
     VENDOR_ID_SK_TELESYS,
+    VENDOR_ID_SMARTISAN,
     VENDOR_ID_SONY,
     VENDOR_ID_SONY_ERICSSON,
     VENDOR_ID_T_AND_A,