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

Skip to content
Commit 56de8a2f authored by Steve Kondik's avatar Steve Kondik
Browse files

Merge branch '237-merge' of git://github.com/CyanogenMod/android_packages_apps_Settings into HEAD 

Conflicts:
	res/values-pt/strings.xml

Change-Id: I3fa4fc8748fcbc545be97fc2cb2667ccff690248
parents 25194f29 e347a393
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