Merge "Fix potential NPE in ImsCall notifyConferenceStateUpdated." into mnc-dr-dev
authorTyler Gunn <tgunn@google.com>
Wed, 9 Sep 2015 16:14:57 +0000 (16:14 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 9 Sep 2015 16:14:57 +0000 (16:14 +0000)
commit4f14347f9149b8827d344770307bdf442cd2ff0d
treebf8f02c7964aad35a64f289c1c5052681b0b6bfb
parent8ca52ff89d9f43cf1ff04d1d607a0b904e749a82
parent9e3452a8efa430f9ca04379be3da6baf0bb0f51a
Merge "Fix potential NPE in ImsCall notifyConferenceStateUpdated." into mnc-dr-dev