| commit | 0bcf4952d08721afd5da48d8b33b5d869e8e2c8f | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Aug 13 20:53:29 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Aug 13 20:53:29 2021 +0000 |
| tree | 8536a59c8818cf5eb9ca12d5e56af3783f865469 | |
| parent | c3c30d95f32af2a934615df677f69860b72d3a03 [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: I45adca601e04e92cd98f1c89f697547e830b9a9c