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

Skip to content
Commit a27856d4 authored by Ian Pedowitz's avatar Ian Pedowitz
Browse files

resolve merge conflicts of 695f21a6 to oc-dr1-dev 

Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ifeffa55c7fb80b0f327ecc5b50cefeca9db6457b
Merged-In: I558447f282bb54f13be1622c3f2528a383fbc3b7
parents dacd9ed1 695f21a6
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