am cd0d5935: am 6c65cd5d: am 60218f19: Merge "Add gionee USB vendor id."

* commit 'cd0d593569d7f2b8f8ec81ab3ef6dd942230e973': Add gionee USB vendor id.
2014-06-16 18:11:41 +00:00 · 2014-06-16 18:11:41 +00:00 · def14fc4ed
parent 7011a85606 cd0d593569
commit def14fc4ed
1 changed files with 3 additions and 0 deletions
--- a/adb/usb_vendors.c
+++ b/adb/usb_vendors.c
@ -74,6 +74,8 @@
 #define VENDOR_ID_GIGABYTE      0x0414
 // Gigaset's USB Vendor ID
 #define VENDOR_ID_GIGASET       0x1E85
+// GIONEE's USB Vendor ID
+#define VENDOR_ID_GIONEE        0x271D
 // Google's USB Vendor ID
 #define VENDOR_ID_GOOGLE        0x18d1
 // Haier's USB Vendor ID
@ -210,6 +212,7 @@ int builtInVendorIds[] = {
    VENDOR_ID_GARMIN_ASUS,
    VENDOR_ID_GIGABYTE,
    VENDOR_ID_GIGASET,
+    VENDOR_ID_GIONEE,
    VENDOR_ID_GOOGLE,
    VENDOR_ID_HAIER,
    VENDOR_ID_HARRIS,