Merge "Add carrier's option to cancel CS reject cause notification"

author Jordan Liu <jminjie@google.com>

Tue, 12 Mar 2019 20:13:35 +0000 (13:13 -0700)

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

Tue, 12 Mar 2019 20:13:35 +0000 (13:13 -0700)
author Jordan Liu <jminjie@google.com>
Tue, 12 Mar 2019 20:13:35 +0000 (13:13 -0700)
committer android-build-merger <android-build-merger@google.com>
Tue, 12 Mar 2019 20:13:35 +0000 (13:13 -0700)
diff --cc telephony/java/android/telephony/CarrierConfigManager.java

index 2bf1dda,3454c1c..29c0ef3

mode 100644,100755..100755
--- 1/telephony/java/android/telephony/CarrierConfigManager.java
--- 2/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
author	Jordan Liu <jminjie@google.com>
	Tue, 12 Mar 2019 20:13:35 +0000 (13:13 -0700)
committer	android-build-merger <android-build-merger@google.com>
	Tue, 12 Mar 2019 20:13:35 +0000 (13:13 -0700)