Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit 19f1b751 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "settings(nfc): Remove NFC beam settings" into main... 

[automerger skipped] Merge "settings(nfc): Remove NFC beam settings" into main am: e8df63f1 am: 3510cd0a -s ours

am skip reason: Merged-In I40974a26d170cf3eeec18e6a07a21f6c420eca9e with SHA-1 ad565c49 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2808364



Change-Id: I8cc0f159c9f47eb96fef3c32d2dc5d66a036c90d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 767ff472 3510cd0a
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment