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

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

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

Conflicts:
	res/values-zh-rCN/strings.xml
	res/values/cm_strings.xml
	src/com/android/settings/profiles/SetupActionsFragment.java

Change-Id: I305d6195adaa95d3f2872556a08d82d1ede19b65
parents a73c6203 d1031672
Hide 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