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

Skip to content
Commit 10ae593a authored by Eric Erfanian's avatar Eric Erfanian
Browse files

This change brings Dialer oc-mr1-dev up to date with v11.1 RC06. 

This is to resolve a merge conflict in:
I48296c56fb1d275a06b7c314f5380266c1195ef2

Test: make

master is already up to date and

Merged-In: I858e3665253139b8aab4e4c063bfc4c419f33cc9

Change-Id: Ifc146f2fec24fd2f8a51cd32feb3699bb1c07136
parent e1a73952
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