tree 7a6ccf14e7ecc9cf63c6edeb638232bb09879ed5
parent 95a4d52a4bbb6e85c205cec53539d7eedd599fe5
parent 44b81d9d294af008e41cffde030a328efe8eeff9
author Xin Li <delphij@google.com> 1633656015 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633656015 +0000

[automerger skipped] Merge Android 12 am: 44b81d9d29 -s ours

am skip reason: Merged-In I5b235cdf4ae9572bb3768d75bd58e5a7dd9967e6 with SHA-1 95a4d52a4b is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/SecureElement/+/1847735

Change-Id: Ib4eddd7b74d049d4f1d143629048d24cb8e826a8