am de7b60a1: am 849dfc35: am 20fab81a: Merge "Fix crash when doing conferencing over Wi-Fi" into mnc-dev
am de7b60a1: am 849dfc35: am 20fab81a: Merge "Fix crash when doing conferencing over Wi-Fi" into mnc-dev

* commit 'de7b60a19bebdfd47b03715e67c3d5b4ea12de14':
  Fix crash when doing conferencing over Wi-Fi

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base