tree ec2481aea3fde990de32fe59daece97984fdddf2
parent 2483a6541ba669f9eafe99035754e61f98249d21
parent c338a5067aed42466fc4e966acb2ccd94c75aa47
author Alisher Alikhodjaev <alisher@google.com> 1630009689 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1630009689 +0000

[automerger skipped] Type confusion due to race condition on tag type change am: c46f6bae6e -s ours am: c338a5067a -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: Iab6b67f67ae446466ca79a6ded9fedfc27bff8ac