tree c62083d3eae2cc6892c3856c561c10b491ef5e11
parent 4b8bedb865410a1ee005a9801902e1e4b8110552
parent f07f1e5fb141c00285862ad39cb74fb69b791313
author Phil Burk <philburk@google.com> 1493741641 +0000
committer android-build-merger <android-build-merger@google.com> 1493741641 +0000

Merge "aaudio: set errorCallback user data" into oc-dev am: 90430d91fa
am: f07f1e5fb1

Change-Id: I446b0ef65654cd425e2c1c160d5fc68c09e7c875