tree d5e034785cc83174a48f3bfee3d8cd2e6330aa75
parent 7783112ceb4c7b0af2158236eb48723184cdc39e
parent 76f3c913d1818652517955c74bec100f2cb915b9
author Phil Burk <philburk@google.com> 1496770101 +0000
committer android-build-merger <android-build-merger@google.com> 1496770101 +0000

Merge "aaudio: reserve some error codes" into oc-dev am: 94e16458f4
am: 76f3c913d1

Change-Id: Id3256f8dcf3ae32cd95016caeadca1208c13aee0