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

Commit 7bdfc321 authored by Suren Baghdasaryan's avatar Suren Baghdasaryan
Browse files

resolve merge conflicts of 885ff611 to pi-dev-plus-aosp 

Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: I0dfd3b1424c106437acbd68059d14ca5b0146a8d
parents e2337579 885ff611
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