OSDN Git Service

Merge "Add strings and carrier config needed network service." am: a3ccb8d854
authorMalcolm Chen <refuhoo@google.com>
Tue, 6 Feb 2018 23:14:06 +0000 (23:14 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 6 Feb 2018 23:14:06 +0000 (23:14 +0000)
commitd7672c6f49e9afce638a973425e5c5e1f5279431
tree023bdeb976c9f024e4f03878cfc54d3d734d0f25
parentcf4d62fdd3a604eb53ed9b1912d6cc0c28d54c97
parent0c2a5852f53b7b6bac4a047d28bedac793f82440
Merge "Add strings and carrier config needed network service." am: a3ccb8d854
am: 0c2a5852f5

Change-Id: I51a4792545c4fb06611681ef2f4ca1183f2fd61a
core/res/AndroidManifest.xml
core/res/res/values/config.xml
core/res/res/values/symbols.xml
telephony/java/android/telephony/CarrierConfigManager.java