commit | 081bfe5a6dff0f7e51321841f65c2023238a047c | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Thu May 06 17:54:34 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu May 06 17:54:34 2021 +0000 |
tree | dd3f0ed9afdb3dfe8e6381b06bc9a5da84c4c3fe | |
parent | aa1c4f562f1de96737c729cf6035923634e13b73 [diff] | |
parent | c133b64582b131a6c42a4c9988b205c61fa60a14 [diff] |
Merge "Keystore 2.0: Add convenience API for watchdog module." am: 665e2cbf99 am: c133b64582 Original change: https://android-review.googlesource.com/c/platform/system/security/+/1697385 Change-Id: Ie5debd329ec3e9425027457b0e9d4c804eb9ee85