OSDN Git Service

Merge "Query isEmergencySmsMode API when checking if emergency for GPS"
authorBrad Ebinger <breadley@google.com>
Fri, 22 Mar 2019 17:36:07 +0000 (10:36 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 22 Mar 2019 17:36:07 +0000 (10:36 -0700)
commit3b176bc1dedfccbbe396aff9a3cf3e21096eb3e6
tree668ca0837ac1d503cd7123fffa2e1261519b9340
parent02f43694e40bb8d2d5418c420bb08f65eef21377
parentdedc27142d515f084c59b4fc70abefebbed19ae0
Merge "Query isEmergencySmsMode API when checking if emergency for GPS"
am: dedc27142d

Change-Id: Ieccb97fb300455e9338c022c46466bed355be79a
telephony/java/android/telephony/CarrierConfigManager.java
telephony/java/android/telephony/TelephonyManager.java
telephony/java/com/android/internal/telephony/ITelephony.aidl