OSDN Git Service

Merge "Fix naming of key" am: 0b74a1dabb
authorJordan Liu <jminjie@google.com>
Tue, 10 Jan 2017 23:44:43 +0000 (23:44 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 10 Jan 2017 23:44:43 +0000 (23:44 +0000)
commit1d67d022fb5f49ce88bae26d1175c1f391b025d6
tree87dae19071cbd1c6cf2dd48546613bbe6737cdbb
parent367f70cca4cd7bd95c4e09508906a94b29f20a2d
parentc68c2f68854302d86e3f4aaba5edb8556b42d1df
Merge "Fix naming of key" am: 0b74a1dabb
am: c68c2f6885

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