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

Commit 2794758e authored by Stanislav Zholnin's avatar Stanislav Zholnin Committed by android-build-merger
Browse files

resolve merge conflicts of 3899c91c to qt-r1-dev-plus-aosp 

am: 11762974

Change-Id: Iab699b7471679f28eff3ec62c05dbe1a307de803
parents 76244252 11762974
Show 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