Fix potential error copying null conference participant list. am: 108a6b7283 am:...
Tyler Gunn [Wed, 24 Aug 2016 22:37:03 +0000 (22:37 +0000)]
am: ce8a6542dd

Change-Id: Ic288a4c11b80b43ded2d1695b038a08aacbaf8d8

1  2 
src/java/com/android/ims/ImsCall.java

Simple merge