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

Skip to content
Commit 091925b0 authored by Brint E. Kriebel's avatar Brint E. Kriebel
Browse files

Merge branch 'cm-11.0' into stable/cm-11.0 

Conflicts:
	res/values-fr/cm_strings.xml
	res/values-lt/cm_strings.xml
	res/values-zh-rHK/cm_strings.xml

Change-Id: I27ea076f35af5bbe1c74907e6ccea23fffb7c8cd
parents 11184aad dbd31fc0
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment