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

Skip to content
Commit e0aedc2e authored by Adrian Salido's avatar Adrian Salido
Browse files

resolve merge conflicts of d916d941 to qt-qpr1-dev 

Test: I solemnly swear I tested this conflict resolution.
Bug: 139557239
Change-Id: I4966f630b0e980e17cbbbcf9b280e034eaeb651e
Merged-In: Ia85a60fde55afaed5106462942e0bb77652ec737
parents b419fa86 d916d941
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