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

Skip to content
Commit d3eff41d authored by Matt Garnes's avatar Matt Garnes
Browse files

Merge CAF branch 'caf/LA.BR.1.2.1_rb2.17' into caf/cm-12.0. 

Conflicts:
	res/values-zh-rCN/strings.xml

Change-Id: Ia13e9c7da4a4a3b40be2346685ac9add43567c0f
parents 4b9ac6ac b6e22e14
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