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

Skip to content
Commit 0576ea48 authored by Fan Zhang's avatar Fan Zhang
Browse files

resolve merge conflicts of e8411c44 to master 

Test: make RunSettingsRoboTests
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I7575438bf364f3f4a6ea0372e6216fd5d5a5bb69
parents bd3cbf44 e8411c44
Hide 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