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

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

[automerger skipped] Merge "settings(payments): Use newly exposed formal API... 

[automerger skipped] Merge "settings(payments): Use newly exposed formal API for CardEmulation.getServices()" into main am: 85ca373e am: f19320ac -s ours am: 20ceda45 -s ours

am skip reason: Merged-In Iaaa37a8e55d755f8abcbaa26c31bf7962e166e96 with SHA-1 ad01bf88 is already in history

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



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