tree e484fb25d9196aa2588717be3c7b9049efd2b240
parent 56b3045d259c8b892f363256ae814bb48776269d
parent 40dfebabcb0698bcfaa3aff8da0610fbada12e63
author Xin Li <delphij@google.com> 1660691391 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1660691391 +0000

[automerger skipped] DO NOT MERGE - Merge Android 13 am: c7858204da -s ours am: 40dfebabcb -s ours

am skip reason: Merged-In I61ac054c32525b8509baafd70840fbed0f1ab7c4 with SHA-1 196cde7bf2 is already in history

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

Change-Id: I2a9fad0a47dcecbafb6b9b75886483c234cf7738
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>