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

Commit c65c7ae6 authored by Alan Viverette's avatar Alan Viverette
Browse files

Merge commit '6682183b' into manualmerge 

Conflicts:
	core/res/res/values/public.xml

Change-Id: Ic91db6ee85dcd8a6b13716b600b04c78ceac4b33
parents 240b8368 c3710eb2
Expand all 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