tree b7d679a8e5bde0f898d7e4c6ca03dd9fb0daf00c
parent de9f57460ee931c46d899204aa72eb042e43639c
parent 2db646e53edd7f3082149bc38d4c57866994cf30
author Xin Li <delphij@google.com> 1633679830 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633679830 +0000

[automerger skipped] Merge "Merge Android 12" am: 1c7835ca97 -s ours am: ed5cb382b9 -s ours am: 2db646e53e -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: I18a00cb758e41f39674e02b1ebc6208c4605767b