| commit | 691899084c84f9c5d0fbcdc0016ce680d344c2ab | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Aug 13 20:51:42 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Aug 13 20:51:42 2021 +0000 |
| tree | ce07eb8edba6988e583b7f3a35e98f2d22e5503d | |
| parent | ef3781e8ffa4fe8e9ecf05eec91bdec4bf1a743f [diff] | |
| parent | 10599ad255d4e52debe58c5c73a05419a3c70261 [diff] |
[automerger skipped] Merge stage-aosp-sc-ts-dev before making it an upstream am: 10599ad255 -s ours am skip reason: Merged-In I77d92d95f0db738059c515f0699e154c7cb19e33 with SHA-1 b30ded9d98 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/keymaster/+/15550181 Change-Id: Id5bb456fa51bfafbae154221d3fd775037982488