Merge "Integrate Select-To-Speak in Vision Settings."

author Chao Chen <chchao@google.com>

Thu, 26 Jan 2017 00:18:32 +0000 (00:18 +0000)

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

Thu, 26 Jan 2017 00:18:36 +0000 (00:18 +0000)
author Chao Chen <chchao@google.com>
Thu, 26 Jan 2017 00:18:32 +0000 (00:18 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 26 Jan 2017 00:18:36 +0000 (00:18 +0000)
diff --cc res/values/strings.xml
Simple merge
diff --cc tests/robotests/assets/grandfather_not_implementing_indexable
Simple merge
author	Chao Chen <chchao@google.com>
	Thu, 26 Jan 2017 00:18:32 +0000 (00:18 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 26 Jan 2017 00:18:36 +0000 (00:18 +0000)
		1	2
res/values/strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history
tests/robotests/assets/grandfather_not_implementing_indexable	patch \|	diff1 \|	diff2 \|	blob \| history