| commit | 036e9e145428f2eeac5b9781876e5d0462ba3d5b | [log] [tgz] |
|---|---|---|
| author | Roshan Pius <rpius@google.com> | Tue Oct 24 14:30:16 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Oct 24 14:30:16 2023 +0000 |
| tree | 3f720d6e711175ec9cc99790ea76da80ac8db79c | |
| parent | 31228a26b9c3a63b90ca569a95d8bcfa1c2c5940 [diff] | |
| parent | eb66a4858cd4a12a0833b5bf989ed99e900dafb7 [diff] |
Merge "Revert "Revert "svc(nfc): Use NfcAdapter API to enable/disable""" into main am: 1d98705039 am: eb66a4858c Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2799364 Change-Id: I07e9bd04d08f3c6fb5eee48c55238c8ba19b9137 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>