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