am 4f14347f: Merge "Fix potential NPE in ImsCall notifyConferenceStateUpdated." into...
Tyler Gunn [Wed, 9 Sep 2015 16:27:28 +0000 (16:27 +0000)]
* commit '4f14347f9149b8827d344770307bdf442cd2ff0d':
  Fix potential NPE in ImsCall notifyConferenceStateUpdated.


Trivial merge