Merge "Manual merge of ag/2319717"

author Phil Weaver <pweaver@google.com>

Tue, 30 May 2017 19:46:17 +0000 (19:46 +0000)

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

Tue, 30 May 2017 19:46:18 +0000 (19:46 +0000)
author Phil Weaver <pweaver@google.com>
Tue, 30 May 2017 19:46:17 +0000 (19:46 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 30 May 2017 19:46:18 +0000 (19:46 +0000)
diff --cc AndroidManifest.xml
Simple merge
diff --cc src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
Simple merge
author	Phil Weaver <pweaver@google.com>
	Tue, 30 May 2017 19:46:17 +0000 (19:46 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 30 May 2017 19:46:18 +0000 (19:46 +0000)
		1	2
AndroidManifest.xml	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java	patch \|	diff1 \|	diff2 \|	blob \| history