Merge commit '6f3737f' into merge
Etan Cohen [Fri, 22 May 2015 00:29:39 +0000 (17:29 -0700)]
1  2 
src/java/com/android/ims/ImsManager.java