commit 9c3040568536ffbc416f39202d723c18715a9ad2
author TreeHugger Robot <treehugger-gerrit@google.com> Fri May 17 01:12:08 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 17 01:12:08 2019 +0000
tree e54cababf6be047906e8f9db5abb97c3c860d182
parent 5d482c1ac092956960675ace30d13250a717b64e
parent 6b7282777ebe3561c26c743731b335df0e247bbc

Merge changes from topic "am-43697f63-c871-4599-8a93-0863b4dc5e9d" into oc-dev

* changes:
  [automerger] DO NOT MERGE: audiopolicy: Remove raw pointer references to AudioMix am: 24ea472772 am: ffd550a634 am: 26fe734207 am: e6fabf9be7 skipped: 56b857516b
  [automerger] DO NOT MERGE: audiopolicy: Remove raw pointer references to AudioMix am: 24ea472772 am: ffd550a634 am: 26fe734207 am: e6fabf9be7
  [automerger] DO NOT MERGE: audiopolicy: Remove raw pointer references to AudioMix am: 24ea472772 am: ffd550a634 am: 26fe734207
  [automerger] DO NOT MERGE: audiopolicy: Remove raw pointer references to AudioMix am: 24ea472772 am: ffd550a634
  [automerger] DO NOT MERGE: audiopolicy: Remove raw pointer references to AudioMix am: 24ea472772
  DO NOT MERGE: audiopolicy: Remove raw pointer references to AudioMix