resolved conflicts for merge of 190cabb3 to master
diff --git a/adb/usb_vendors.c b/adb/usb_vendors.c
index b98c8ad..73bf418 100644
--- a/adb/usb_vendors.c
+++ b/adb/usb_vendors.c
@@ -57,6 +57,8 @@
#define VENDOR_ID_DELL 0x413c
// Nvidia's USB Vendor ID
#define VENDOR_ID_NVIDIA 0x0955
+// Garmin-Asus's USB Vendor ID
+#define VENDOR_ID_GARMIN_ASUS 0x091E
/** built-in vendor list */
@@ -72,6 +74,7 @@
VENDOR_ID_FOXCONN,
VENDOR_ID_DELL,
VENDOR_ID_NVIDIA,
+ VENDOR_ID_GARMIN_ASUS,
};
#define BUILT_IN_VENDOR_COUNT (sizeof(builtInVendorIds)/sizeof(builtInVendorIds[0]))