OSDN Git Service

Merge "Emergency SMS carrier config flag"
authorBrad Ebinger <breadley@google.com>
Fri, 29 Jun 2018 00:26:39 +0000 (17:26 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 29 Jun 2018 00:26:39 +0000 (17:26 -0700)
am: 36a9fa62be

Change-Id: If6a2b0316ee0fdac29eedcf77686694f538d5017

1  2 
api/current.txt
telephony/java/android/telephony/CarrierConfigManager.java

diff --cc api/current.txt
Simple merge