| commit | 2692482cdba4233ccd52f5653c2bc986dcf4cb96 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Aug 13 21:30:42 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Aug 13 21:30:42 2021 +0000 |
| tree | ce07eb8edba6988e583b7f3a35e98f2d22e5503d | |
| parent | 2456ac8d759b95a0d00f7845c726b0a1710bc058 [diff] | |
| parent | 0bcf4952d08721afd5da48d8b33b5d869e8e2c8f [diff] |
[automerger skipped] Merge stage-aosp-sc-ts-dev before making it an upstream am: 10599ad255 -s ours am: 0bcf4952d0 -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: I0bc0dd20c147656b9673af71466635d89f96cd6c