tree e2bb4f11eebd93b95ae684121a4d6c522e0a9ba8
parent 115d26539dd00018030c2d1c2a681f2856410732
parent d7dc4937bbf35a2bcc1cb44b85458a20c37d9f83
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1559266898 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1559266898 +0000

Merge changes from topic "am-8e4aea8f45b8425cb2c609522934b9db" into qt-r1-dev-plus-aosp

* changes:
  audio: fix AEC/NS effect control am: b0c9148b00 am: 75f07c9acb
  audio: fix control flow am: aaa9496b98 am: 5d273ebc31