| commit | 2ade54178e9964f827b234476304416b5170d653 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Sat Aug 14 00:27:10 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Aug 14 00:27:10 2021 +0000 |
| tree | 4c3d643e672568f3d6c5900376391ad7b4e8266b | |
| parent | c0bed97146686337f6d2e801e6d36a005943be63 [diff] | |
| parent | 23479a75fff40aa6086d4a299eadacb5aab49fc4 [diff] |
[automerger skipped] Merge stage-aosp-sc-ts-dev before making it an upstream am: 10599ad255 -s ours am: 0bcf4952d0 -s ours am: eaad679394 -s ours am: 23479a75ff -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: Ib6e2f4c0728b6f2b7b0e36978e975890037d4958