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

Commit 7d8bb82d authored by Ying Wang's avatar Ying Wang
Browse files

Merge commit 'd348ea6e' into manual-merge 

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

Change-Id: Id80cc50b669d7ea840d28839431126023980e5a1
parents c24ffe6f d348ea6e
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