tree b7d679a8e5bde0f898d7e4c6ca03dd9fb0daf00c
parent 7cfe316cc2f6b881df6a589ee94e4db0f727a1e1
parent 9166a73d13edccded8ccc7141fe2da85e40f9a4a
author Xin Li <delphij@google.com> 1633683618 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633683618 +0000

[automerger skipped] Merge "Merge Android 12" am: 1c7835ca97 -s ours am: ed5cb382b9 -s ours am: 2db646e53e -s ours am: c0e0736cf7 -s ours am: 9166a73d13 -s ours

am skip reason: Merged-In Ibac10766358da418de5f64487275292845aa86cc with SHA-1 d1cb414049 is already in history

Original change: https://android-review.googlesource.com/c/platform/external/jsilver/+/1847425

Change-Id: Iba195bfb9b32efff00d6da034621ba7e6954a609