[automerger skipped] Merge "Update nfc from hidl to aidl service" into tm-qpr-dev am: 16cc944791
-s ours am: 4ad986e592
-s ours
am skip reason: Merged-In I288474f691670655516728fe0e164a3e5689875c with SHA-1 d6a8c63837
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/18408305
Change-Id: Ibbe161abe42a71680b6bfb0250ed5c6cd1c979e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
cf94a63f08