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

Skip to content
Commit cab76b2b authored by Roshan Pius's avatar Roshan Pius Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "Implement DISALLOW_NFC AE user restriction" into... 

[automerger skipped] Merge "Implement DISALLOW_NFC AE user restriction" into main am: a3f6a70e am: e86e4717 -s ours am: 8e02a787 -s ours am: d46ca2b5 -s ours

am skip reason: Merged-In I8ef4b7a3630535bde9eedb4da78ae3fee8e13234 with SHA-1 f72a53a5 is already in history

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



Change-Id: Ifc88d90d8a6d7c6210cd6391e9ce7fa06fc73849
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bae3928e d46ca2b5
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