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

Commit 6b64bcf7 authored by Xin Li's avatar Xin Li
Browse files

resolve merge conflicts of 3e0e9f8a to oc-mr1-dev-plus-aosp 

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I0bd86c50a1baea9d34c897d4be2bf784f2002178
parents 80c80607 3e0e9f8a
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