am 4f14347f: Merge "Fix potential NPE in ImsCall notifyConferenceStateUpdated." into...
authorTyler Gunn <tgunn@google.com>
Wed, 9 Sep 2015 17:06:44 +0000 (17:06 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 9 Sep 2015 17:06:44 +0000 (17:06 +0000)
commita7bf2167a940a0278e5caf9a6830f8edb32c2053
treebf8f02c7964aad35a64f289c1c5052681b0b6bfb
parentad3f59fe18b3064a3af03c9427b89a8f32586c8e
parent4f14347f9149b8827d344770307bdf442cd2ff0d
am 4f14347f: Merge "Fix potential NPE in ImsCall notifyConferenceStateUpdated." into mnc-dr-dev

* commit '4f14347f9149b8827d344770307bdf442cd2ff0d':
  Fix potential NPE in ImsCall notifyConferenceStateUpdated.