am 8d9d362b: Merge "adb: Add USB vendor ID for SONIM TECHNOLOGIES, INC."

* commit '8d9d362b0cc999b11db2495c657a6b268705467a':
  adb: Add USB vendor ID for SONIM TECHNOLOGIES, INC.
This commit is contained in:
Colin Cross 2014-07-25 03:35:51 +00:00 committed by Android Git Automerger
commit edf41f981c

View file

@ -164,6 +164,8 @@
#define VENDOR_ID_SK_TELESYS 0x1F53
// Smartisan's USB Vendor ID
#define VENDOR_ID_SMARTISAN 0x29a9
// Sonim Tech's USB Vendor ID
#define VENDOR_ID_SONIM_TECH 0x1d9c
// Sony's USB Vendor ID
#define VENDOR_ID_SONY 0x054C
// Sony Ericsson's USB Vendor ID
@ -261,6 +263,7 @@ int builtInVendorIds[] = {
VENDOR_ID_SHARP,
VENDOR_ID_SK_TELESYS,
VENDOR_ID_SMARTISAN,
VENDOR_ID_SONIM_TECH,
VENDOR_ID_SONY,
VENDOR_ID_SONY_ERICSSON,
VENDOR_ID_T_AND_A,