Merge "Resolved accessibility service preference summary strings to use a common...

author Saige McVea <saigem@google.com>

Fri, 24 Mar 2017 22:56:03 +0000 (22:56 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Fri, 24 Mar 2017 22:56:04 +0000 (22:56 +0000)
author Saige McVea <saigem@google.com>
Fri, 24 Mar 2017 22:56:03 +0000 (22:56 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 24 Mar 2017 22:56:04 +0000 (22:56 +0000)
diff --cc res/values/strings.xml
Simple merge
diff --cc src/com/android/settings/accessibility/AccessibilitySettings.java
Simple merge
author	Saige McVea <saigem@google.com>
	Fri, 24 Mar 2017 22:56:03 +0000 (22:56 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 24 Mar 2017 22:56:04 +0000 (22:56 +0000)
		1	2
res/values/strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/settings/accessibility/AccessibilitySettings.java	patch \|	diff1 \|	diff2 \|	blob \| history