tree fa022ba9333a2e488d7aed0114a2d2f935bdc4c4
parent d5c896094a8c87a9ce2656dda1f56baaca2c92b8
parent e8861eb6ef20280440605d1d71ffbccc800b32f5
author David Drysdale <drysdale@google.com> 1646132540 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1646132540 +0000

Merge "Drop unused AuthorizationSet::Union method" am: e8861eb6ef

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

Change-Id: Ied47ebbc750a3d405db5b2cd936cb6c22bac0bcc