resolved conflicts for merge of 47b08cf5 to mnc-vt-dev
Pavel Zhamaitsiak [Thu, 6 Aug 2015 23:49:00 +0000 (16:49 -0700)]
Change-Id: I0e70fb526f50c30cd44db9ffaf46e47ab48faa9e

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