Merge "Make loadSafeLabel a generic facility as makeSafeForPresentation"

author TreeHugger Robot <treehugger-gerrit@google.com>

Tue, 16 Oct 2018 16:21:10 +0000 (16:21 +0000)

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

Tue, 16 Oct 2018 16:21:10 +0000 (16:21 +0000)
author TreeHugger Robot <treehugger-gerrit@google.com>
Tue, 16 Oct 2018 16:21:10 +0000 (16:21 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 16 Oct 2018 16:21:10 +0000 (16:21 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
diff --cc core/java/android/text/TextUtils.java
Simple merge
author	TreeHugger Robot <treehugger-gerrit@google.com>
	Tue, 16 Oct 2018 16:21:10 +0000 (16:21 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 16 Oct 2018 16:21:10 +0000 (16:21 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/android/text/TextUtils.java	patch \|	diff1 \|	diff2 \|	blob \| history