tree f656271de0aa6438bb1f98cadef065207c1d45c3
parent 1a87369861e4d91862d2461ea1b0681247a51501
parent b034469f3d9e86e33e6cf3f281362d5a1f3f7707
author TreeHugger Robot <treehugger-gerrit@google.com> 1585931090 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1585931090 +0000

[automerger skipped] Merge "Adding GetVerifiedBootParams to soft keymaster context" into rvc-dev am: 3d85d69171 am: b034469f3d -s ours

am skip reason: Change-Id I85be3717ed74c4ae3da13e6ba38a65a7213364d0 with SHA-1 2a32fb9d1d is in history

Change-Id: Idb242f98701185bc155c0938857bc21ea0af45a8