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

Skip to content
Commit d7fb51a4 authored by Andreas Gampe's avatar Andreas Gampe
Browse files

resolve merge conflicts of 20d9ae56 to oc-mr1-dev-plus-aosp 

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I73cd9a9198ef5640a6b3dced713fcbb17563dd8b
parents 1b43913b 20d9ae56
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment