tree 3db04822df3ee2da5dac8ab12fcae741a299f3da
parent d38016f885769a031ec180c9e05dc661760a6417
parent e21d3d924740309d74ac4db1e1e38287f7f56ea7
author Xin Li <delphij@google.com> 1614810524 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614810524 +0000

[automerger skipped] Merge RQ2A.210305.007 am: e21d3d9247 -s ours

am skip reason: Change-Id I0bcb339f01c664e59e258daf901460523b84c468 with SHA-1 d38016f885 is in history

Original change: https://android-review.googlesource.com/c/platform/hardware/knowles/athletico/sound_trigger_hal/+/1613216

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5dc99ba9c1281f61e9adaa3b884b6b0f9f0c0ed6