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

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

[automerger skipped] Merge "settings: Remove @hide NFC API usage" into main... 

[automerger skipped] Merge "settings: Remove @hide NFC API usage" into main am: 75a49e0a am: e234fe32 -s ours

am skip reason: Merged-In I6f87ad7ae03c67aaa2ddb0ac2529debc53278ba8 with SHA-1 0d11f492 is already in history

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



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