OSDN Git Service

Merge "Add carrier config option to show call barring UI in CallSettings" am: 2aa0cdd1d2
authorJordan Liu <jminjie@google.com>
Fri, 2 Feb 2018 04:27:27 +0000 (04:27 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 2 Feb 2018 04:27:27 +0000 (04:27 +0000)
commit32d87828e0f367c74a7473688d1b28135eaf4ef8
treefba35e93cd669d6eaaabfed6e9abfbfb4872f76b
parent114adea744805b2e9fef2ed8f9a25f6c2c81df46
parentba0581bcf1ee98a2320eefa3048c74eeeb556e81
Merge "Add carrier config option to show call barring UI in CallSettings" am: 2aa0cdd1d2
am: ba0581bcf1

Change-Id: If09ae852661ab154804ad9f30a2eea0839f291c0
telephony/java/android/telephony/CarrierConfigManager.java