tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

resolved conflicts for merge of 246808be to jb-dev-plus-aosp

Browse source 
Change-Id: I3415e2d7b4e8295b7415951c0e8a78c775574089
This commit is contained in:
Xavier Ducrohet 2012-05-15 10:44:29 -07:00
commit c7a67d0fc4
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
adb/usb_vendors.c
View file

@ -125,6 +125,8 @@
#define VENDOR_ID_SONY 0x054C
// Lab126's USB Vendor ID
#define VENDOR_ID_LAB126 0x1949
// Yulong Coolpad's USB Vendor ID
#define VENDOR_ID_YULONG_COOLPAD 0x1EBF
/** built-in vendor list */
int builtInVendorIds[] = {
@ -173,6 +175,7 @@ int builtInVendorIds[] = {
VENDOR_ID_INQ_MOBILE,
VENDOR_ID_SONY,
VENDOR_ID_LAB126,
VENDOR_ID_YULONG_COOLPAD,
};
#define BUILT_IN_VENDOR_COUNT (sizeof(builtInVendorIds)/sizeof(builtInVendorIds[0]))