Merge "Fix javadoc HTML escaping."

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

Mon, 4 Mar 2019 16:22:20 +0000 (16:22 +0000)

committer Gerrit Code Review <noreply-gerritcodereview@google.com>

Mon, 4 Mar 2019 16:22:20 +0000 (16:22 +0000)
author Treehugger Robot <treehugger-gerrit@google.com>
Mon, 4 Mar 2019 16:22:20 +0000 (16:22 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Mon, 4 Mar 2019 16:22:20 +0000 (16:22 +0000)
diff --cc telephony/java/android/provider/Telephony.java
Simple merge
diff --cc telephony/java/android/telephony/TelephonyManager.java
Simple merge
author	Treehugger Robot <treehugger-gerrit@google.com>
	Mon, 4 Mar 2019 16:22:20 +0000 (16:22 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Mon, 4 Mar 2019 16:22:20 +0000 (16:22 +0000)
		1	2
telephony/java/android/provider/Telephony.java	patch \|	diff1 \|	diff2 \|	blob \| history
telephony/java/android/telephony/TelephonyManager.java	patch \|	diff1 \|	diff2 \|	blob \| history