commit | c9c60f3aa7a266909d0751898d15b4e0440193bb | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Feb 24 17:05:18 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Feb 24 17:05:18 2022 +0000 |
tree | ca858e833168f94911b995a395894346c121dc5e | |
parent | 4862dfacc1e510e3098c2b5b7839147695492339 [diff] | |
parent | 5ef5c443b1f6326a55b9b6a1908baa952076eb2a [diff] |
[automerger skipped] Merge "Remove the old CompOS key management" am: 071549e707 -s ours am: aeba7421d3 -s ours am: 5ef5c443b1 -s ours am skip reason: Merged-In Ia649165630048a3b625e6c7aa84e8b5d18d2a8da with SHA-1 4827dd5eef is already in history Original change: https://android-review.googlesource.com/c/platform/system/security/+/1997310 Change-Id: I5c576c86af1911fa5dc866223579c6232c04f5cb