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

Commit acfbf500 authored by Pavlin Radoslavov's avatar Pavlin Radoslavov
Browse files

resolve merge conflicts of ee5796f8 to oc-dev-plus-aosp 

Test: Code inspection.
Change-Id: I13a192920f58d8cea622a6acb2fb46fd07fdd195
parents 99ada4c9 ee5796f8
Show 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