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

Skip to content
Commit 0beb862b authored by Baligh Uddin's avatar Baligh Uddin
Browse files

resolve merge conflicts of aef843f9 to qt-dev-plus-aosp 

Test: I solemnly swear I tested this conflict resolution.
BUG: 133225687

Change-Id: I9efff587a1984db9d1907c0dde2444f58c1410e1
parents f26f7053 aef843f9
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