OSDN Git Service

Merge "Fix naming of key" am: 0b74a1dabb am: c68c2f6885
authorJordan Liu <jminjie@google.com>
Tue, 10 Jan 2017 23:55:55 +0000 (23:55 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 10 Jan 2017 23:55:55 +0000 (23:55 +0000)
commit11765b3fcc776ca93eb9cf7b024a7c09b7d7555c
tree42ed29356ae9b310b707eb5bc59138b8a7752b34
parent6c852fb22802ef8da44d2806fa0f17f08acd9542
parent1d67d022fb5f49ce88bae26d1175c1f391b025d6
Merge "Fix naming of key" am: 0b74a1dabb am: c68c2f6885
am: 1d67d022fb

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