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