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

Skip to content
Commit fb00d1c5 authored by Bob Badour's avatar Bob Badour Committed by Automerger Merge Worker
Browse files

Merge "resolve merge conflicts of cfcf5835 to... 

Merge "resolve merge conflicts of cfcf5835 to sc-dev" into sc-dev am: a173e4ee

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I94782b1ab3e5c237d804cbb5941c264fc7990fe1
parents 50e3d507 a173e4ee
Show 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