tree b7d679a8e5bde0f898d7e4c6ca03dd9fb0daf00c
parent b723db42ecf38e587ab6343f1ab087e673009627
parent c0e0736cf7ccb320944aec1687c3b5623fd81e9f
author Xin Li <delphij@google.com> 1633681808 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633681808 +0000

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