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

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

resolve merge conflicts of 255b69ac to oc-dev-plus-aosp 

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I9caf7542f11b0b322da063a5a08140384eba0ce0
parents 3bb97f1b 255b69ac
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