tree 19c32f3cf8148e187b9d7ad1c082648fbbf9c0f1
parent ebe3fcf8fe83331ded2165d2f129fae51754ce3a
parent 0405c4f57319646682e8cecf13d541c94cf1af2e
author Roshan Pius <rpius@google.com> 1698072271 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1698072271 +0000

Merge "svc(nfc): Use NfcAdapter API to enable/disable" into main am: 6285b21624 am: 0405c4f573

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2798234

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