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

Skip to content
Commit a1a2c66e authored by Gopal G Goberu's avatar Gopal G Goberu
Browse files

Merge commit '716c5bcc' into HEAD 

Conflicts:
	core/res/res/values-zh-rTW/strings.xml

Change-Id: If6b6719b7d53287d5d103f28dffe6967d6992d60
parents 8e3565e5 716c5bcc
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