diff options
| author | Anthony Stange <stange@google.com> | 2021-03-25 22:00:59 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-25 22:00:59 +0000 |
| commit | d1a8d70d09db0bf469e50c94804e55fb6548961e (patch) | |
| tree | 73aceaacde4071f111a7e748cc327001a572720f /security/keymint/aidl/vts/functional/AttestKeyTest.cpp | |
| parent | bcb9768032d391c931bc21252e7c0915fb770c73 (diff) | |
| parent | 8a673bc15eb1a4db61fcccac677338ea6077f0f7 (diff) | |
Merge "Don't assert while a callback is registered" am: 6a022ad1c4 am: d5e4905caa am: 8a673bc15e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1654108
Change-Id: If6b5fe800955b602be362f269d6350014e384c6a
Diffstat (limited to 'security/keymint/aidl/vts/functional/AttestKeyTest.cpp')
0 files changed, 0 insertions, 0 deletions