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

Skip to content
Commit 3d57a015 authored by Sudheer Shanka's avatar Sudheer Shanka
Browse files

resolve merge conflicts of 803c0528 to qt-dev-plus-aosp 

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I6c435c2e8443cd7bf5959bfbdfb05f188308d524
Merged-In: Ib8a10d3a9097c1dc4132a71782d622e9e3c3747d
parents fcc06eec 803c0528
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