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

Commit 66f4e1c3 authored by Tarandeep Singh's avatar Tarandeep Singh
Browse files

resolve merge conflicts of 9a0d4240 to master 

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I0c20323087f1a2d8eb1ead6cfc60a69e42d2d51b
parents 10c41c27 9a0d4240
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