OSDN Git Service

am a001f7ae: Merge "Add carrier config variable to hide merge call button" into mnc...
authorTyler Gunn <tgunn@google.com>
Thu, 20 Aug 2015 17:23:08 +0000 (17:23 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 20 Aug 2015 17:23:08 +0000 (17:23 +0000)
commit2dae512abe24f1261564a4629eba9f60777f1bc2
tree405b6a0032ef28813d84c279a1c23ee59acbf6d8
parent1809a56568c6b28666890ea1a926de70ce9c2ae9
parenta001f7ae7fde0418a6f8e455f88a2d7dc3c392ce
am a001f7ae: Merge "Add carrier config variable to hide merge call button" into mnc-dr-dev

* commit 'a001f7ae7fde0418a6f8e455f88a2d7dc3c392ce':
  Add carrier config variable to hide merge call button
telephony/java/android/telephony/CarrierConfigManager.java