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

Skip to content
Commit b0818e88 authored by Nicolas Geoffray's avatar Nicolas Geoffray
Browse files

resolve merge conflicts of c2421a2a to oc-dev-plus-aosp 

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I5825e002c7ac5655703cd31d84ccc1cb5379f0e0
parents 596fc8b8 c2421a2a
Hide 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