am 5e6df5ab: am f1c280b4: am 7ce263a8: Merge "Make adb_api.h safe to include first."

* commit '5e6df5ab2a40d2562bf06b152b5c11bd3be0d341':
  Make adb_api.h safe to include first.
This commit is contained in:
Dan Albert
2015-03-21 15:20:00 +00:00
committed by Android Git Automerger

View File

@@ -17,6 +17,9 @@
#ifndef ANDROID_USB_API_ADBWINAPI_H__ #ifndef ANDROID_USB_API_ADBWINAPI_H__
#define ANDROID_USB_API_ADBWINAPI_H__ #define ANDROID_USB_API_ADBWINAPI_H__
#include <windows.h>
#include <usb100.h>
/** \file /** \file
This file consists of declarations of routines exported by the API as well This file consists of declarations of routines exported by the API as well
as types, structures, and constants definitions used in the API. as types, structures, and constants definitions used in the API.