| commit | b6d641463a6053b63b13df2e072343435170acdd | [log] [tgz] |
|---|---|---|
| author | Alisher Alikhodjaev <alisher@google.com> | Wed Aug 25 20:57:33 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Aug 25 20:57:33 2021 +0000 |
| tree | 9dd12aa49313cdc87b1bf663848e6448d55fa8e1 | |
| parent | 114bc03fc4c50a3347ca533fc14933f8aeadf17d [diff] | |
| parent | 21f8ef6e4cb4049cd852830b404c015d02a0a708 [diff] |
[automerger skipped] Type confusion due to race condition on tag type change am: 8227ca062e am: e69b08a43f am: c14c7c8da6 am: 265e992cc4 -s ours am: 21f8ef6e4c -s ours am skip reason: Merged-In Iebfcaf9d269381ef2ba14a26e6124f173d2299ec with SHA-1 ad4982472c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/nfc/+/15351598 Change-Id: I635830786ee4525ab793db47167a9d4629ef4419