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

Skip to content
Commit 7e8b2742 authored by Jonathan Miranda's avatar Jonathan Miranda
Browse files

resolve merge conflicts of 11bf817e to sc-v2-dev 

Bug: 190210234
Bug: 190164147
Test: manual

Change-Id: I155ee7efdbda10c05f87001ac4eaf07017a6d456
Merged-In: I230c33d7e4e1871d8d702737c56c79ce46504b8f
parents 1f804199 11bf817e
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