tree 81669406a226e931c3ea2e27c3d924c2b02dd9bd
parent a3b429e8312d3203ba36f86a66affbde794e509b
parent 458a5258a8a48e2941abda8dc31a7bffd69b281f
author Alan Stokes <alanstokes@google.com> 1701443831 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1701443831 +0000

Merge upstream changes am: 2b4b898d75 am: 458a5258a8

Original change: https://android-review.googlesource.com/c/platform/external/open-dice/+/2852550

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