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

Skip to content
Commit 3092f981 authored by Martijn Coenen's avatar Martijn Coenen
Browse files

resolve merge conflicts of 32ba3eaa to oc-mr1-dev-plus-aosp 

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I731eba80656edbf87a5d5ba3af63a2c607ac61a6
Merged-In: Id71e2348eabf5101d1fd286bbc0076154703d159
parents a9a2b287 32ba3eaa
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