Merge "Fix potential NPE in ImsCall notifyConferenceStateUpdated." into mnc-dr-dev
Tyler Gunn [Wed, 9 Sep 2015 16:14:57 +0000 (16:14 +0000)]

Trivial merge