diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-05-14 21:59:13 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-14 21:59:13 +0000 |
| commit | 36a8274a0c5ef868afe7671a2364a4906522513e (patch) | |
| tree | 60099973ebc8b604afbe0ea0a27f2e5f913b5728 /security/keymint/aidl/vts/functional/KeyMintTest.cpp | |
| parent | 034fa19e4ded5e96b4db78579d133c42b31308ce (diff) | |
| parent | 0ba331884c277a6cf1060c351964299456d6c302 (diff) | |
[automerger skipped] Merge changes Id027b742,I486ccad8 am: 44c294e621 am: 6ece4c1da3 am: 0ba331884c -s ours
am skip reason: Merged-In I58bd8b941f6340d9e69153702b5269cc35c646da with SHA-1 0d591fd0a4 is already in history
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1705136
Change-Id: I10aeff652ccd63ecb323b1f731385af4d012d17f
Diffstat (limited to 'security/keymint/aidl/vts/functional/KeyMintTest.cpp')
0 files changed, 0 insertions, 0 deletions