tree 09579aeb91dc296649c41f41afdf6e1f0727952b
parent 963eb722db5c209a0c07e8770fa4a2a80e1929b6
parent c46f6bae6eead08db2cf8802597d6a79abecd61d
author Alisher Alikhodjaev <alisher@google.com> 1630008703 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1630008703 +0000

[automerger skipped] Type confusion due to race condition on tag type change am: c46f6bae6e -s ours

am skip reason: Merged-In I93c36bf0f6b92e33a5d03d7420251f5bcf112d66 with SHA-1 963eb722db is already in history

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

Change-Id: Icbf1dd58260706c48f3a43ce2bbe2519762b46a4