tree 4c3d643e672568f3d6c5900376391ad7b4e8266b
parent 8939c719f10e3d84d8aa3eb95f43072665ea63e7
parent 1ac9492ddbe80f3b654b4fe6ef09c67adf452051
author Xin Li <delphij@google.com> 1629246257 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1629246257 +0000

[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: abd6b40ada -s ours am: 0cbc833457 -s ours am: 49fb6f1cdc -s ours am: 1ac9492ddb -s ours

am skip reason: Merged-In I5c239fb24acd53a1a96b245b74a5d27b92e97a1e with SHA-1 ef3781e8ff is already in history

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

Change-Id: I29cdc603c793bb1972a7b1bd8f0c68cd39b7f534