am 06fcfc50: am 02e30945: Merge "Fix missing #includes in hardware/libhardware."

* commit '06fcfc506c44724bbd8089e8971b77aa8edfdde8':
  Fix missing #includes in hardware/libhardware.

diff --cc modules/usbaudio/alsa_device_proxy.c
index 902a6d2,676f288..77e8ca3
--- 1/modules/usbaudio/alsa_device_proxy.c
--- 2/modules/usbaudio/alsa_device_proxy.c
+++ b/modules/usbaudio/alsa_device_proxy.c
@@@ -20,9 -20,11 +20,11 @@@
  
  #include <log/log.h>
  
+ #include <errno.h>
+ 
  #include "alsa_device_proxy.h"
  
 -#include "logging.h"
 +#include "audio_logging.h"
  
  #define DEFAULT_PERIOD_SIZE     1024
  #define DEFAULT_PERIOD_COUNT    2