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

Skip to content
Commit 6bdca178 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:
	core/res/res/values-zh-rCN/cm_strings.xml

Change-Id: Ib885c2b25a7260b1f6837a9031f0d2a5794c86b7
parents 56cfe1d6 3dfb5ec9
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