diff options
| author | 2023-10-23 22:15:30 +0000 | |
|---|---|---|
| committer | 2023-10-23 22:15:30 +0000 | |
| commit | 99b118f298a64a8f544838440a8c09e4b421ef37 (patch) | |
| tree | 2eac922a191845050ee0f35a98de505e1fabe7f1 /libs/androidfw/ApkParsing.cpp | |
| parent | 714286d19af06cefb6d3edc7d7516390bb33ff94 (diff) | |
| parent | 3162241e108b22735057db3466f24b4b39809716 (diff) | |
Merge "Revert "svc(nfc): Use NfcAdapter API to enable/disable"" into main am: 47be3bb627 am: 3162241e10
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2799537
Change-Id: Icba54b9715a78014e77faa48e23a68c43d00bd4b
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