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

Skip to content
Commit 6b1b6876 authored by Baligh Uddin's avatar Baligh Uddin Committed by android-build-merger
Browse files

resolve merge conflicts of aef843f9 to... 

resolve merge conflicts of aef843f9 to qt-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. BUG: 133225687 am: 0beb862b
am: 1724a20e

Change-Id: I1292fb211ba0af18fc0790d82a1ce7be77d1865f
parents 5e7ef56a 1724a20e
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