| commit | 23479a75fff40aa6086d4a299eadacb5aab49fc4 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Aug 13 23:32:29 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Aug 13 23:32:29 2021 +0000 |
| tree | ce07eb8edba6988e583b7f3a35e98f2d22e5503d | |
| parent | acb3c740ba6e12c06f955efacb1765ce8020c798 [diff] | |
| parent | eaad67939432456802418579e3b7cbceb1b2cbd6 [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 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: I3d92006987aacb4dbd6175a3d87953105b86c4f8