tree 08d227e3b1c7ef976133211beec46c34384edfe3
parent 8915aa45803e45546c69c93b92301e62b96b7e76
parent 3ba4c56dcab581ff31c295db5242dfb032fe8deb
author Treehugger Robot <treehugger-gerrit@google.com> 1678915008 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1678915008 +0000

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

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

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