tree 428cf3250154e754aba76813cdc10dc7e6e10ab5
parent 60a0ec12eab5ac551229afcfce3105da3570b4cd
parent f028b52c6bbd4cc29412931b233a4bba783ac2f8
author Xin Li <delphij@google.com> 1633679831 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633679831 +0000

[automerger skipped] Merge "Merge Android 12" am: 3971322857 -s ours am: 39e7199203 -s ours am: f028b52c6b -s ours

am skip reason: Merged-In I05e4aa3a0ce2a4412547246cfe28841bd54aac4c with SHA-1 23655852ba is already in history

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

Change-Id: Iaecebbb4920b9e4b49b774e9e5498751b02735b8