diff options
| author | 2023-10-23 22:42:01 +0000 | |
|---|---|---|
| committer | 2023-10-23 22:42:01 +0000 | |
| commit | eaa6609500c243b98b7b3b428a6a2de00b2cfc31 (patch) | |
| tree | 1dbba135936e9ff63177ee55af9c06af1e4185ca /libs/androidfw/FileStream.cpp | |
| parent | 1a14e406edc4d681e3105b7812265cc9b542dc1b (diff) | |
| parent | 714286d19af06cefb6d3edc7d7516390bb33ff94 (diff) | |
Merge "Revert "svc(nfc): Use NfcAdapter API to enable/disable"" into main am: 47be3bb627 am: 8b0f90257a am: 714286d19a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2799537
Change-Id: I337d51bc8410046f2f84d834539825963c45e723
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