OSDN Git Service

Merge changes from topic "getDeviceCapableModemCount" am: 8ed3fb4bcf
authorXiangyu/Malcolm Chen <refuhoo@google.com>
Tue, 29 Oct 2019 23:15:58 +0000 (16:15 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 29 Oct 2019 23:15:58 +0000 (16:15 -0700)
commit9ed67f1ba64a17434d2e5fe5aec6c8dfb4d4c62c
tree0e65f14d58692c3fca6d56a414c6e1cb623894dd
parent05c8a179c8d5869c0ffce4f2d500266b5c2712ff
parentdd9d9fde6816758a1fe1e77f08293d0255dd1e73
Merge changes from topic "getDeviceCapableModemCount" am: 8ed3fb4bcf
am: dd9d9fde68

Change-Id: I48303451f2ad1eeab2513ac5994de2b97649d82b
packages/SystemUI/src/com/android/keyguard/CarrierTextController.java
packages/SystemUI/tests/src/com/android/keyguard/CarrierTextControllerTest.java
telephony/java/android/telephony/SubscriptionManager.java
telephony/java/android/telephony/TelephonyManager.java