Merge "Merge "TextClassifier API updates." into pi-dev am: bf9dfb16be" into pi-dev...

author Abodunrinwa Toki <toki@google.com>

Mon, 2 Apr 2018 22:20:45 +0000 (22:20 +0000)

committer android-build-merger <android-build-merger@google.com>

Mon, 2 Apr 2018 22:20:45 +0000 (22:20 +0000)
author Abodunrinwa Toki <toki@google.com>
Mon, 2 Apr 2018 22:20:45 +0000 (22:20 +0000)
committer android-build-merger <android-build-merger@google.com>
Mon, 2 Apr 2018 22:20:45 +0000 (22:20 +0000)
diff --cc api/current.txt
Simple merge
diff --cc core/java/android/widget/TextView.java
Simple merge
author	Abodunrinwa Toki <toki@google.com>
	Mon, 2 Apr 2018 22:20:45 +0000 (22:20 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Mon, 2 Apr 2018 22:20:45 +0000 (22:20 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/android/widget/TextView.java	patch \|	diff1 \|	diff2 \|	blob \| history