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

Skip to content
Commit aef82a68 authored by Adrian Salido's avatar Adrian Salido Committed by android-build-merger
Browse files

[automerger skipped] resolve merge conflicts of... 

[automerger skipped] resolve merge conflicts of d916d941 to qt-qpr1-dev am: e0aedc2e -s ours
am: 10544ab1 -s ours
am skip reason: change_id Ia85a60fde55afaed5106462942e0bb77652ec737 with SHA1 0f0ddc10 is in history

Change-Id: I38a82395c2b48e4172fcd3b87bfec89ee97d14c8
parents 4fd64a35 10544ab1
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