Merge "New carrier config enhanced_4g_lte_title_variant_int"

author Clown SHEN <clownshen@google.com>

Thu, 4 Oct 2018 00:07:19 +0000 (00:07 +0000)

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

Thu, 4 Oct 2018 00:07:19 +0000 (00:07 +0000)
author Clown SHEN <clownshen@google.com>
Thu, 4 Oct 2018 00:07:19 +0000 (00:07 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 4 Oct 2018 00:07:19 +0000 (00:07 +0000)
diff --cc telephony/java/android/telephony/CarrierConfigManager.java
Simple merge
author	Clown SHEN <clownshen@google.com>
	Thu, 4 Oct 2018 00:07:19 +0000 (00:07 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Thu, 4 Oct 2018 00:07:19 +0000 (00:07 +0000)