tree 3711d80f7c7c0f6daf73af4a78484747c6ee73f5
parent 7810d7a5626dbc54ee190dbd38957624f90021f9
parent dd8ff009e4943579d53c47d64b0ae2de62bf1b45
author Xin Li <delphij@google.com> 1633657145 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633657145 +0000

[automerger skipped] Merge Android 12 am: f4be0e805a -s ours am: dd8ff009e4 -s ours

am skip reason: Merged-In I3a661bed1ae2ee68896f860d7f694ac67bbb9475 with SHA-1 8fd5536b7d is already in history

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

Change-Id: Ie90d74bebe3564f7a692888f7dcada43763ab5c4