| commit | 8939c719f10e3d84d8aa3eb95f43072665ea63e7 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Mon Aug 16 15:13:53 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Aug 16 15:13:53 2021 +0000 |
| tree | 4c3d643e672568f3d6c5900376391ad7b4e8266b | |
| parent | 568d33fc8420584621117fb37c06d43e38e2d388 [diff] | |
| parent | cabcb5764a7cbabed295d7b66fb0758831f77f67 [diff] |
[automerger skipped] Merge stage-aosp-sc-ts-dev before making it an upstream am: 10599ad255 -s ours am: cabcb5764a -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: I8903e888f1969a76da52eb4a9826647a69249454