tree 9070ee6e3238af598cf0e56ba8330d30cc4a089b
parent 0ea6031cc73fa8265c528c510400f7a78bacd7c7
parent 4960fb8a2866575d4cc1b77629b56ebb2c95a58f
author Eric Laurent <elaurent@google.com> 1570495413 -0700
committer android-build-merger <android-build-merger@google.com> 1570495413 -0700

[automerger skipped] Merge "audio policy: fix capture policy for HOTWORD source" am: 9ee56ec1a7 -s ours am: 809da62adb -s ours am: 4f69a42655 -s ours
am: 4960fb8a28 -s ours
am skip reason: change_id Ic17bfd70675ef749d6a678d067112b1dbd205746 with SHA1 c6af90d5ef is in history

Change-Id: Ib9d9369e6a6a0d67a656f625c585ff07cb6e0dac