diff options
| author | 2023-10-24 14:59:22 +0000 | |
|---|---|---|
| committer | 2023-10-24 14:59:22 +0000 | |
| commit | 27c5079cbf3207efc87eea9fe52708e48cad647e (patch) | |
| tree | 8fd1d24dcfe2931f02fd6b5cbcde1d112c81c49a /libs/androidfw/ApkParsing.cpp | |
| parent | 72c6685cda6c64e89f3b8251e706364a119bb291 (diff) | |
| parent | 036e9e145428f2eeac5b9781876e5d0462ba3d5b (diff) | |
Merge "Revert "Revert "svc(nfc): Use NfcAdapter API to enable/disable""" into main am: 1d98705039 am: eb66a4858c am: 036e9e1454
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2799364
Change-Id: Idd47b428034d0188a57290c32b6521b271c2248b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ApkParsing.cpp')
0 files changed, 0 insertions, 0 deletions