Merge "Add carrier config key for TTY support."

author Tyler Gunn <tgunn@google.com>

Fri, 8 Mar 2019 18:17:24 +0000 (10:17 -0800)

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

Fri, 8 Mar 2019 18:17:24 +0000 (10:17 -0800)
author Tyler Gunn <tgunn@google.com>
Fri, 8 Mar 2019 18:17:24 +0000 (10:17 -0800)
committer android-build-merger <android-build-merger@google.com>
Fri, 8 Mar 2019 18:17:24 +0000 (10:17 -0800)
diff --cc api/current.txt
Simple merge
diff --cc telephony/java/android/telephony/CarrierConfigManager.java
Simple merge
author	Tyler Gunn <tgunn@google.com>
	Fri, 8 Mar 2019 18:17:24 +0000 (10:17 -0800)
committer	android-build-merger <android-build-merger@google.com>
	Fri, 8 Mar 2019 18:17:24 +0000 (10:17 -0800)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
telephony/java/android/telephony/CarrierConfigManager.java	patch \|	diff1 \|	diff2 \|	blob \| history