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

Skip to content
Commit 8c1e4e80 authored by Pengquan Meng's avatar Pengquan Meng
Browse files

resolve merge conflicts of 8f843170 to qt-qpr1-dev-plus-aosp 

Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: I52368e2d4d0585bb4a3b9401f6b268408952fcc6
parents b402c73c 8f843170
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