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

Skip to content
Commit e56c006c 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-de/codeaurora_strings.xml
	res/values-fr/codeaurora_strings.xml
	res/values-lt/codeaurora_strings.xml

Change-Id: I0e79eeb4bd48a9ba9d36f8fe4fa17651822d442b
parents e8c335aa 0e166e36
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