am 615af25f: am a421c1e5: Merge "Possible Mac build fix."

* commit '615af25ffdde99331c173499446e08c3a7ec32a8':
  Possible Mac build fix.
This commit is contained in:
Elliott Hughes 2015-08-26 01:14:30 +00:00 committed by Android Git Automerger
commit 1533f95bba

View file

@ -118,7 +118,7 @@ AndroidInterfaceAdded(void *refCon, io_iterator_t iterator)
IOUSBDeviceInterface197 **dev = NULL; IOUSBDeviceInterface197 **dev = NULL;
HRESULT result; HRESULT result;
SInt32 score; SInt32 score;
UInt32 locationId; uint32_t locationId;
UInt8 if_class, subclass, protocol; UInt8 if_class, subclass, protocol;
UInt16 vendor; UInt16 vendor;
UInt16 product; UInt16 product;