| commit | 2db646e53edd7f3082149bc38d4c57866994cf30 | [log] [tgz] |
|---|---|---|
| author | Xin Li <[email protected]> | Fri Oct 08 01:39:54 2021 +0000 |
| committer | Automerger Merge Worker <[email protected]> | Fri Oct 08 01:39:54 2021 +0000 |
| tree | b7d679a8e5bde0f898d7e4c6ca03dd9fb0daf00c | |
| parent | b2382cc665fc19991e0b8f6fbfdede82aa6e0ff3 [diff] | |
| parent | ed5cb382b94588c0940745e61b15c2f6bc7898ca [diff] |
[automerger skipped] Merge "Merge Android 12" am: 1c7835ca97 -s ours am: ed5cb382b9 -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: Ic92e5a9679463f78fd0944ce02f570ad7d56ae38