summaryrefslogtreecommitdiff
path: root/security/keymint/support/authorization_set.cpp
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2021-01-20 00:33:20 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-01-20 00:33:20 +0000
commitb9579ecd9709ed757d8c72dad77ddba15a1b19e0 (patch)
tree3c50b0ae1c2a999a3f5fd240a157146e5e067ccb /security/keymint/support/authorization_set.cpp
parent727db8d6b7bef2532984fde4518eeaf1c44821e1 (diff)
parent0f8f618e8a7ed29ac29db4c631d83c1e558de216 (diff)
[automerger skipped] Merge changes from topics "nnapi-canonical-burst", "nnapi-updatable-drivers" am: 9b770726be am: 4ed32668d9 am: 0f8f618e8a -s ours
am skip reason: Change-Id Ie1fffdc89dc5bd325d3cd7806d2de632b8513cf9 with SHA-1 297108360f is in history Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1554339 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I920f723da724e47ab31e6866171c5399d283715f
Diffstat (limited to 'security/keymint/support/authorization_set.cpp')
0 files changed, 0 insertions, 0 deletions