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

Skip to content
Commit c91edfc6 authored by Mikhail Naganov's avatar Mikhail Naganov
Browse files

resolve merge conflicts of a0c27243 to qt-qpr1-dev-plus-aosp 

Change-Id: I16a3a50a39c52384eec75d6576e7a862fa8b8385
parents 15bf0cff a0c27243
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