| commit | fb88bdd69731a5d5758b2f659589cb33d163cf3c | [log] [tgz] |
|---|---|---|
| author | Janis Danisevskis <jdanis@google.com> | Thu May 06 18:52:13 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu May 06 18:52:13 2021 +0000 |
| tree | bc82ce47f6eb98603a0bfe49dd7767f751e96570 | |
| parent | 976be643e54612c74bc769808c0e777815213317 [diff] | |
| parent | 5bd71712375053e4613f7dbef5308382e18bae47 [diff] |
Merge "Keystore 2.0: Add watch dog instrumentations in the calls into keystore." am: 5bd7171237 Original change: https://android-review.googlesource.com/c/platform/system/security/+/1696846 Change-Id: If4b0e1b557b19b85533d19905bbe3df175eb8497