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

Skip to content
Commit eeb60f94 authored by Wei Wang's avatar Wei Wang
Browse files

Merge commit 'fc8d2556' into manualmerge 

Conflicts:
	res/values/strings.xml

Change-Id: Ia2a4480d13f5afae7ecef321dadf5c4686907d99
parents c0af0c46 fc8d2556
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