tree 3344d8ff0a5729592cb672f0fd8bfa5099421931
parent 6b984f634477b48011deeeb9e9c03eb0fc06b483
parent 2a20554f45bba2be962b43012d313e560c1cac45
author David Drysdale <drysdale@google.com> 1638861147 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1638861147 +0000

Merge "Turn off CFI for the Keymaster VTS" am: 1ff635ab2d am: ab78c4b682 am: 2a20554f45

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1906291

Change-Id: I9ca29ba6bb0070c165ede769abdea405abd6c6eb