am 487ba445: am 69050202: Fixes Conference call map null pointer exception
am 487ba445: am 69050202: Fixes Conference call map null pointer exception

* commit '487ba445d0a904b13c74d99a2e6e1c2fb0ca71a6':
  Fixes Conference call map null pointer exception

md5555/android_packages_services_Telephony