tree d9ca2cb2372afb5ccd76d2fb15fca97004353823
parent 23655852baede4536b372203a701ffc7a41c6759
parent 39713228579d6242e54b9d5c324c7a5c9461a5eb
author Xin Li <delphij@google.com> 1633656030 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633656030 +0000

[automerger skipped] Merge "Merge Android 12" am: 3971322857 -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: I166dee909238c1f24e734a608fed762e13ec5cc4