tree 428cf3250154e754aba76813cdc10dc7e6e10ab5
parent 0e1df42fa6caf0f6b7bfbc940be9e91999deded2
parent 3c0fdffe638cddbdbf7724c27a3261ab2306ef41
author Xin Li <delphij@google.com> 1637208715 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1637208715 +0000

[automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am: 5d3e1c5fe6 -s ours am: e32c26deab -s ours am: 3c0fdffe63 -s ours

am skip reason: Merged-In Iaecebbb4920b9e4b49b774e9e5498751b02735b8 with SHA-1 769b5dc50d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/sonivox/+/16276062

Change-Id: Ia4b2b9a6e9fa09754c9161a4cd8dea3438036f69