tree e063a92b3d559d5affd8af255cc7dc6b3d46e052
parent e3dd4f59c8383bdec909e87860ede1c7c12407d2
parent 2dd56c9e2c9874471d3c9ec7d2bbfdaccbd554d4
author Phil Burk <philburk@google.com> 1500418850 +0000
committer android-build-merger <android-build-merger@google.com> 1500418850 +0000

Merge "aaudio: fix intermittent hang and position error" into oc-dr1-dev am: c1fe2634dc
am: 2dd56c9e2c

Change-Id: I2324f99835d005d46cc2838888c3cc65e66730a1