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

Skip to content
Commit c9040ad9 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/cm_strings.xml
	src/com/android/settings/profiles/triggers/WifiTriggerFragment.java

Change-Id: I66d8b879df7167e087b98717da26529d0bcbe494
parents fdac0909 74044ef4
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