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

Skip to content
Commit ef15776a authored by Lucas Dupin's avatar Lucas Dupin
Browse files

resolve merge conflicts of a1f64b0a to oc-mr1-dev 

Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ic2395d055e1f27b186c3b87be5440dc410ee16a3
parents 3072aa76 a1f64b0a
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