[automerger skipped] Merge "Switch NFC from HIDL to AIDL" into tm-d1-dev am: 1fac8143e4
am: 6e4792cd43
am: c88db168c7
-s ours
am skip reason: Merged-In Ide115013131a79989d36e0a738a2918166192731 with SHA-1 6ee6dd6e8e
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/18219676
Change-Id: Id29f2ee9c789f6333d5bc9709a000f9e04dc520a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
dea4dbcec8