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

Skip to content
Commit 50e3d507 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: 0b209e94

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie37237ed214a3e09f8fde48469bbbf4c96c18900
parents 9512b0f9 0b209e94
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