[automerger skipped] Merge "Revert "Update nfc from hidl to aidl service"" am: 610af798f5
am: bd74710d56
am: b75f28c76d
am: 853b440b6f
am: 2e6da947a3
-s ours
am skip reason: Merged-In I288474f691670655516728fe0e164a3e5689875c with SHA-1 130f2b784e
is already in history. Merged-In was found from reverted change.
Reverted change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2098014
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2098183
Change-Id: I0a615d0f39187e21f529b6e64e82ce584e54b77b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
2d9ec80fed