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

Skip to content
Commit 3b87854a authored by Dave Mankoff's avatar Dave Mankoff
Browse files

resolve merge conflicts of 8d7481f0 to qt-r1-dev-plus-aosp 

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ie3a1b2fbdf159c8cc6f50f0426930eedae458a09
parents a50e7bb2 8d7481f0
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