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

Skip to content
Commit 0443bbc0 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/cm_strings.xml
	res/xml/lockscreen_interface_settings.xml

Change-Id: Id88fcfa9b01f0f323c1d97b5558e9ff74956ed14
parents 6e7786d6 f8ca5be0
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