Merge commit 'e691706' into merge2
Etan Cohen [Fri, 24 Apr 2015 21:07:44 +0000 (14:07 -0700)]
1  2 
src/java/com/android/ims/ImsCall.java
src/java/com/android/ims/internal/ImsCallSession.java

Simple merge