am 4f14347f: Merge "Fix potential NPE in ImsCall notifyConferenceStateUpdated." into...
authorTyler Gunn <tgunn@google.com>
Wed, 9 Sep 2015 16:27:28 +0000 (16:27 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 9 Sep 2015 16:27:28 +0000 (16:27 +0000)
commitf35f867398d41594b7c6d99978d4f42b77ce1551
tree6ab324510155c887f3c2113f64fd5bd6ade76e77
parent874bb1e6d94f94506b9ff507fa42a320064b5e52
parent4f14347f9149b8827d344770307bdf442cd2ff0d
am 4f14347f: Merge "Fix potential NPE in ImsCall notifyConferenceStateUpdated." into mnc-dr-dev

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