commit a4eb0d86a29be2763be5fac51727858d5095794b
author Phil Burk <philburk@google.com> Wed Apr 12 15:44:06 2017 -0700
committer Phil Burk <philburk@google.com> Thu Apr 13 13:50:40 2017 +0000
tree f725cf700cac0e52e0376b6a9a867f4c37fe3bdc
parent 9e7dd63dfff0cc967f025ea9e27a299aaa99fd69

aaudio: merge contents of  AAudioDefinitions.h into AAudio.h

As requested by native API council.

Bug: 30210002
Bug: 33398120
Test: CTS test_aaudio
Change-Id: I5ea7c53d09469221263d84cf6f82082e67c2523b
Signed-off-by: Phil Burk <philburk@google.com>

media/libaaudio/src/binding/AAudioBinderClient.h

diff --git a/media/libaaudio/src/binding/AAudioBinderClient.h b/media/libaaudio/src/binding/AAudioBinderClient.h
index 5613d5b..1497177 100644
--- a/media/libaaudio/src/binding/AAudioBinderClient.h
+++ b/media/libaaudio/src/binding/AAudioBinderClient.h
@@ -17,7 +17,7 @@
 #ifndef AAUDIO_AAUDIO_BINDER_CLIENT_H
 #define AAUDIO_AAUDIO_BINDER_CLIENT_H
 
-#include <aaudio/AAudioDefinitions.h>
+#include <aaudio/AAudio.h>
 #include "AAudioServiceDefinitions.h"
 #include "AAudioServiceInterface.h"
 #include "binding/AAudioStreamRequest.h"