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

Commit 2b53b03a authored by Andre Eisenbach's avatar Andre Eisenbach
Browse files

resolve merge conflicts of 6a7164f0 to oc-dr1-dev-plus-aosp 

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I11ab2a019d1ab2c202eb47f373bf532deb6814d1
parents ca88745c 6a7164f0
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