| commit | b69a4ed2bb223d4b40b1b217495c0c00845e20ce | [log] [tgz] |
|---|---|---|
| author | Roshan Pius <rpius@google.com> | Thu Sep 05 22:04:24 2024 +0000 |
| committer | Roshan Pius <rpius@google.com> | Thu Sep 05 23:13:13 2024 +0000 |
| tree | 55ca2f4c15f3606c01504965d6fb2cea5d965f37 | |
| parent | 952d275cdd0be810d065ca642a0203ad07366c29 [diff] | |
| parent | 03c81cdc754ba027aa50f3e1944b44c9d8b0ff20 [diff] |
[conflict] Merge "shell(nfc): Add NFC_SET_CONTROLLER_ALWAYS_ON for NFC testing" into main am: 03c81cdc75 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3254877 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Merged-In: Id0233a614491173d48f6111fd0ef4bd9ce50d4a9 Change-Id: I970c29974712e3aab744cd7bd21411217ae64881