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

Skip to content
Commit f2fbd1b7 authored by Andre Eisenbach's avatar Andre Eisenbach
Browse files

resolve merge conflicts of 0533d66a to oc-dev-plus-aosp 

Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ia8b2e2d67fe7dce4b1cb78622352284ea3a8ebec
parents 78f2de0d 0533d66a
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