tree bb82f43fbab9b3a3b447ae594672410c66ff62fd
parent 311b95baa00220cedc56c84faf7d1df1c0b18701
parent e5fe3229f0d8d76433ddb6f06735ff0883e8684e
author Android Build Merger (Role) <android-build-merger@google.com> 1507160555 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1507160555 +0000

Merge "aaudio: disable MMAP mode by not creating AAudioService am: 969f2c97f0 am: 73b78ac7d9  -s ours am: 7b7f4e0f8b  -s ours" into oc-mr1-dev-plus-aosp