Merge "Add CarrierConfig key for RTT support"

author Hall Liu <hallliu@google.com>

Tue, 12 Dec 2017 01:44:08 +0000 (01:44 +0000)

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

Tue, 12 Dec 2017 01:44:08 +0000 (01:44 +0000)
author Hall Liu <hallliu@google.com>
Tue, 12 Dec 2017 01:44:08 +0000 (01:44 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 12 Dec 2017 01:44:08 +0000 (01:44 +0000)
diff --cc telephony/java/android/telephony/CarrierConfigManager.java
Simple merge
author	Hall Liu <hallliu@google.com>
	Tue, 12 Dec 2017 01:44:08 +0000 (01:44 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Tue, 12 Dec 2017 01:44:08 +0000 (01:44 +0000)