tree 3c36644c7dc9781cd35bb2c0b7dcc44873ea630d
parent 2e36d63449318ea4d1602e676001faac52e9a153
parent 2d4c82a9b24239cfbdfd404fcbbfd6e5e8fba77b
author Xin Li <delphij@google.com> 1696578982 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1696578982 +0000

[automerger skipped] Merge "Merge Android 14" into main am: 2d4c82a9b2 -s ours

am skip reason: Merged-In Iba64a513ed63fec30ce624db63aabc3fcea527d2 with SHA-1 99810e76d4 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/st/nfc/+/2776743

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