OSDN Git Service

Merge "aaudio: set errorCallback user data" into oc-dev
authorPhil Burk <philburk@google.com>
Tue, 2 May 2017 16:04:38 +0000 (16:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 2 May 2017 16:04:38 +0000 (16:04 +0000)
am: 90430d91fa

Change-Id: I04ff05fde3ae5df6b89ba782c7e9633a34a352fc


Trivial merge