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

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

[automerger skipped] Merge "nfc(api): Use settings key and feature string... 

[automerger skipped] Merge "nfc(api): Use settings key and feature string since the API is @hide" into main am: f6214326 am: dc8efa9b -s ours am: 62b17de3 -s ours

am skip reason: Merged-In Iecbf1b58ee2305c509da9c90cd421ee0cb91d379 with SHA-1 517e8a3f is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2795936



Change-Id: I17a6098acb1f7d782b592102607f2c74fbaaa193
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0b561d0c 62b17de3
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment