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

Skip to content
Commit e00b371d authored by Ying Wang's avatar Ying Wang
Browse files

Merge commit 'd348ea6e0ad3fc029a01c214da4ad4b8d856c4f9' into manual-merge 

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

Change-Id: Id80cc50b669d7ea840d28839431126023980e5a1
parents 67a565f0 668c7150
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