OSDN Git Service

Merge "Add config to use a display rule that ServiceState was considered" am: bbaa19c...
authorJordan Liu <jminjie@google.com>
Thu, 9 Nov 2017 20:20:21 +0000 (20:20 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 9 Nov 2017 20:20:21 +0000 (20:20 +0000)
commit08cb5e2d15369e20ccca5444efe11926c3b1a9b4
treeb1aa256e92101b5f55ad321cfef5f61d8b03bf6c
parentd01e09c3a896a64558c6143876fb2f3733b8be90
parentc9433550529bb8519a7bbc153a4f2561915b3608
Merge "Add config to use a display rule that ServiceState was considered" am: bbaa19cad3 am: cd89929497
am: c943355052

Change-Id: I51f2c8c7bf6f2fa5d62417459964a85e36bd4302
telephony/java/android/telephony/CarrierConfigManager.java