tree 844241db9ff83f70290665e85a9239cad48d93d3
parent 73c02ea35e368ee87a878f59a0c7a77adafa2732
parent fa54746370232385c1f5060e3740c1aa339b76f7
author Xin Li <delphij@google.com> 1660690511 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1660690511 +0000

[automerger skipped] DO NOT MERGE - Merge Android 13 am: fa54746370 -s ours

am skip reason: Merged-In Iad70e328fcfe84171dae9a83a0981686e7503e9b with SHA-1 239ca39078 is already in history

Original change: https://android-review.googlesource.com/c/platform/external/ukey2/+/2186777

Change-Id: Ide3013201c4c24f002a8454e9b597ed0041b984f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>