| commit | ed5cb382b94588c0940745e61b15c2f6bc7898ca | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Oct 08 01:20:29 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 08 01:20:29 2021 +0000 |
| tree | b7d679a8e5bde0f898d7e4c6ca03dd9fb0daf00c | |
| parent | d1cb414049574206cf1a5d69b63de114d496f18f [diff] | |
| parent | 1c7835ca97f50b5f860ea98d541eca9637849a31 [diff] |
[automerger skipped] Merge "Merge Android 12" am: 1c7835ca97 -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: I38af452e283e850ec8089934077a94480d6f5363