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

Skip to content
Commit 0feadf69 authored by Chris Wailes's avatar Chris Wailes Committed by Mathieu Chartier
Browse files

resolve merge conflicts of 40654b76 to qt-dev-plus-aosp 

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Merged-In: If26d625c4b1e5e8eee54dcdacb32360b0d852829
Change-Id: I36452eb4cfbc1c22533a2168aaa2ee0fad54286c
parents 8eebd293 40654b76
Expand all 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