OSDN Git Service

Merge "expose Carrier Id related APIs" am: 18b925a7af
authorChen Xu <fionaxu@google.com>
Mon, 17 Dec 2018 21:39:23 +0000 (13:39 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 17 Dec 2018 21:39:23 +0000 (13:39 -0800)
commit31cf647396b71bb4a6cc0c7f88ed5616146662c4
tree6a2a862826615fa60dd378817dfd4d474fa749b2
parentb527f8a44c84b25b04101881dbe0bda75826409b
parent0031ae8145b17322b3db19f9ad09b84035d6bb92
Merge "expose Carrier Id related APIs" am: 18b925a7af
am: 0031ae8145

Change-Id: I6e9837cffdcac094557ea99cde0736abdfff0ff9
api/current.txt
telephony/java/android/telephony/CarrierConfigManager.java
telephony/java/android/telephony/TelephonyManager.java
telephony/java/com/android/internal/telephony/ITelephony.aidl