am c33702dd: am 4785ea60: Merge "adb: Add USB vendor ID for Prestigio"

* commit 'c33702dd92da5f41d17ee9a64a8a0ff67f6e9d1b':
  adb: Add USB vendor ID for Prestigio
This commit is contained in:
Colin Cross 2014-04-18 00:52:44 +00:00 committed by Android Git Automerger
commit 48858b21b2

View file

@ -140,6 +140,8 @@
#define VENDOR_ID_PMC 0x04DA
// Positivo's USB Vendor ID
#define VENDOR_ID_POSITIVO 0x1662
// Prestigio's USB Vendor ID
#define VENDOR_ID_PRESTIGIO 0x29e4
// Qisda's USB Vendor ID
#define VENDOR_ID_QISDA 0x1D45
// Qualcomm's USB Vendor ID
@ -237,6 +239,7 @@ int builtInVendorIds[] = {
VENDOR_ID_PHILIPS,
VENDOR_ID_PMC,
VENDOR_ID_POSITIVO,
VENDOR_ID_PRESTIGIO,
VENDOR_ID_QISDA,
VENDOR_ID_QUALCOMM,
VENDOR_ID_QUANTA,