summaryrefslogtreecommitdiffstats
path: root/adb
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2013-04-17 09:27:37 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-04-17 09:27:37 -0700
commitac76c1f16f889140ec5c56faccd676c2ff15d7bc (patch)
treee87e62bfcc77f93e6ed5aed3126ec63f59d28d50 /adb
parentb7b2c71bf8bf685af4c716e78d5c70decab98b54 (diff)
parentffc5a4a529338c834954e58de2701572eb0752f0 (diff)
downloadsystem_core-ac76c1f16f889140ec5c56faccd676c2ff15d7bc.zip
system_core-ac76c1f16f889140ec5c56faccd676c2ff15d7bc.tar.gz
system_core-ac76c1f16f889140ec5c56faccd676c2ff15d7bc.tar.bz2
am ffc5a4a5: Merge "Add OUYA VID to known VID list"
* commit 'ffc5a4a529338c834954e58de2701572eb0752f0': Add OUYA VID to known VID list
Diffstat (limited to 'adb')
-rw-r--r--adb/usb_vendors.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/adb/usb_vendors.c b/adb/usb_vendors.c
index 604c461..698f8a9 100644
--- a/adb/usb_vendors.c
+++ b/adb/usb_vendors.c
@@ -141,6 +141,8 @@
#define VENDOR_ID_XIAOMI 0x2717
// BYD's USB Vendor ID
#define VENDOR_ID_BYD 0x19D1
+// OUYA's USB Vendor ID
+#define VENDOR_ID_OUYA 0x2836
/** built-in vendor list */
@@ -198,6 +200,7 @@ int builtInVendorIds[] = {
VENDOR_ID_OPPO,
VENDOR_ID_XIAOMI,
VENDOR_ID_BYD,
+ VENDOR_ID_OUYA,
};
#define BUILT_IN_VENDOR_COUNT (sizeof(builtInVendorIds)/sizeof(builtInVendorIds[0]))