diff options
| author | 2023-10-23 22:43:10 +0000 | |
|---|---|---|
| committer | 2023-10-23 22:43:10 +0000 | |
| commit | 3d3587b12fcc4bf86121e10b3a854938f0be3275 (patch) | |
| tree | 1dbba135936e9ff63177ee55af9c06af1e4185ca /libs/androidfw/FileStream.cpp | |
| parent | eaa6609500c243b98b7b3b428a6a2de00b2cfc31 (diff) | |
| parent | 99b118f298a64a8f544838440a8c09e4b421ef37 (diff) | |
Merge "Revert "svc(nfc): Use NfcAdapter API to enable/disable"" into main am: 47be3bb627 am: 3162241e10 am: 99b118f298
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2799537
Change-Id: I17971a1e8c7b6c6743727be1942edc7ea397ffa6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/FileStream.cpp')
0 files changed, 0 insertions, 0 deletions