tree 56abdadd4030c23e9fb8258eb42763e1e88530d9
parent b3c9fd9ef6705d0c6b36f00ab9ddff29a99a517d
parent c9c6f441aba106378d4bdf10047a3d730237cf5a
author Seth Moore <sethmo@google.com> 1626722768 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1626722768 +0000

[automerger skipped] Don't fail on TAG_ALLOW_WHILE_ON_BODY am: 88baa7828b am: 8527f6fc24 -s ours am: 65e19139b6 -s ours am: c9c6f441ab -s ours

am skip reason: Merged-In I9f785579e38dbbc45e1e4f993a991ff38b59b6cd with SHA-1 f640f5c65a is already in history

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

Change-Id: I70fc0cb413f3dda91dd960ed04a42ec41f2d7724