workout 2

Change-Id: I61d14872d6aa5336d3177ef4d74a47efc8e452bf
test pie

Change-Id: I44c52039a8c663afac758da5243c06d63ca4aada
Merge branch 'pie' of github.com:westcripp/Resurrection_packages_apps_Settings into pie

Conflicts:
	res/values/arrays.xml
	res/values/strings.xml
	res/xml/resurrection_settings.xml
	src/com/android/settings/Resurrection.java

Change-Id: I9f1b031d237f6b90f84bc6407a2e322e40721a69