[automerger skipped] Merge "Switch NFC from HIDL to AIDL am: 17a923dc37
am: 7d50d7a7b3
" into tm-qpr-dev-plus-aosp am: 8ab20f42d4
-s ours
am skip reason: Merged-In Ieb8be71d3ac4e8e187d8fcc2e3843bfd17112a73 with SHA-1 17a923dc37
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/18219675
Change-Id: I2c231ca3369bd990e9548611c0660ed1e4b1c22c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
3b3f6bbb3d