diff options
| author | 2023-10-23 15:14:44 +0000 | |
|---|---|---|
| committer | 2023-10-23 15:14:44 +0000 | |
| commit | 7591b5f85ce3870a90fb922a37367dbe5e5697e4 (patch) | |
| tree | 6d53d53816f6661d1eb1a14f0bd1add13d62987b /libs/hwui/Properties.cpp | |
| parent | f0c128832eca4c25d7a6269f24dabe37ba75d991 (diff) | |
| parent | 82afe6284cd0209e9ac3755f8dd1ce66165d6634 (diff) | |
Merge "Merge "svc(nfc): Use NfcAdapter API to enable/disable" into main am: 6285b21624 am: 0405c4f573" into udc-qpr-dev-plus-aosp am: 82afe6284c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2798234
Change-Id: Ibd7c93ad042248b94b30641e0bd8b61c19b11ae3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/hwui/Properties.cpp')
0 files changed, 0 insertions, 0 deletions