tree 08d227e3b1c7ef976133211beec46c34384edfe3
parent c6413703702c50c05d5402f6684b92b83164ee84
parent 4d768643e929c56ea7578c154b24bbe463fc9f46
author Treehugger Robot <treehugger-gerrit@google.com> 1678912834 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1678912834 +0000

Merge "Change masked_tag() return type to match BoringSSL change." am: 4d768643e9

Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/2480817

Change-Id: Icee871f39253a7b82bedf6eace05e64efa772869
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>