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