summaryrefslogtreecommitdiff
path: root/security/keymint/aidl/vts/functional/AttestKeyTest.cpp
diff options
context:
space:
mode:
authorMichael Butler <butlermichael@google.com>2022-12-07 05:28:26 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-12-07 05:28:26 +0000
commit8662e87ac4cff537b757af19fa63a31a4a7edb12 (patch)
treef95822fc32e7aa4101328e58f9ae3c2078b2a85d /security/keymint/aidl/vts/functional/AttestKeyTest.cpp
parent14aa961aa7799c521a024a25672bdb675fd6f36a (diff)
parent87279d70a9791d00ead9b1f2a3d896e05c217e19 (diff)
[automerger skipped] Merge changes from topic "cherrypick-cherrypick-cherrypick-nnapi_burst_deserialize-fvwo2wt1ja-mueq5vhv8v-2ym2uz8wjy" into sc-qpr1-dev am: c63fef57a2 -s ours am: 87279d70a9 -s ours
am skip reason: Merged-In I6bfb02a5cd76258284cc4d797a4508b21e672c4b with SHA-1 7a9e483f4b is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/20614826 Change-Id: Ib9d9214a9aed30183ced32e77b42eda506ef6da0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'security/keymint/aidl/vts/functional/AttestKeyTest.cpp')
0 files changed, 0 insertions, 0 deletions