tree 0264c322ac956a7814cfe1f2efafd31ff148c91f
parent 940330e0607cccfffb55c7c34c2f45cb7882860b
parent b8e9b2c8f966028661ff604a7b3bd5781f6cc009
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 1702336984 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1702336984 +0000

[automerger skipped] Merge "Revert^2 "barbet(nfc): Modify NFC overlays for NFC apex"" into main am: 0222c2951b am: ecfe932981 am: b8e9b2c8f9 -s ours

am skip reason: Merged-In Idd6d90ec9eebc84f416a1dbeed02a0c497d9bc85 with SHA-1 da72116590 is already in history

Original change: https://android-review.googlesource.com/c/device/google/barbet/+/2863525

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