Merge commit '6f3737f' into merge
Etan Cohen [Tue, 26 May 2015 16:19:50 +0000 (09:19 -0700)]
1  2 
src/java/com/android/ims/ImsManager.java