tree d4ff3eaf49a7a9bef7daa7ec53d271fbb07f702a
parent 998004649870bc1ceb51a409ba340f0ea8de31b6
parent 0f97865603ab3d0c332333514516618f82f23eb9
author Eric Laurent <elaurent@google.com> 1575620821 -0800
committer android-build-merger <android-build-merger@google.com> 1575620821 -0800

[automerger skipped] Merge changes from topic "audio_hal_tombstones" am: b20ae2f7f7 am: ecd7e40fa5
am: 0f97865603 -s ours
am skip reason: change_id I68c1e8fb4db23e5952ad0c93d7d0b9d121b8ec18 with SHA1 42896a0774 is in history

Change-Id: I4c29d8ac21b07942151b7da99faa6e9c84c4e7ce