| commit | fa76ad2f83b019184fe2f57b2ef6be1d44a80adc | [log] [tgz] |
|---|---|---|
| author | Roshan Pius <rpius@google.com> | Tue Oct 24 15:00:16 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Oct 24 15:00:16 2023 +0000 |
| tree | 8fd1d24dcfe2931f02fd6b5cbcde1d112c81c49a | |
| parent | 27c5079cbf3207efc87eea9fe52708e48cad647e [diff] | |
| parent | 99e8b734d5f80e2e90b4c946478f736d3e05cc82 [diff] |
Merge "Revert "Revert "svc(nfc): Use NfcAdapter API to enable/disable""" into main am: 1d98705039 am: a081325972 am: 99e8b734d5 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2799364 Change-Id: Ibec12ddcfb588c95b1a44c7f3fa55cb966061a59 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>