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

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

resolve merge conflicts of 03bef15f to qt-r1-dev-plus-aosp 

am: 4f429fbc

Change-Id: If0be502d8af4bb1ff526fe83876d9a127a87bd98
parents bcc19239 4f429fbc
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