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

Commit 33b93b21 authored by Marie Janssen's avatar Marie Janssen
Browse files

resolve merge conflicts of 0f9c79e8 to oc-dev-plus-aosp 

Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ibe0fff95570dcf1bc17123bb30722fa3b798910b
parents b97ba185 0f9c79e8
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