tree 428cf3250154e754aba76813cdc10dc7e6e10ab5
parent 57622f6e2a5df08a13da592ac4ba17398f5a2e1e
parent 4ab7e8a8069f4acbcf87212dbb7d3147e80968c3
author Xin Li <delphij@google.com> 1639520341 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1639520341 +0000

[automerger skipped] Merge "Merge Android 12 QPR1" am: 2766181404 -s ours am: 2ae1ac7392 -s ours am: 2b72f9ff1b -s ours am: 4ab7e8a806 -s ours

am skip reason: Merged-In I931120e34f83ca3f667d94d1cf09659908b41463 with SHA-1 5d3e1c5fe6 is already in history

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

Change-Id: I4c4eaaad89c08a51c736089d48b1faff541ddedf