Merge "Prevent merging conference calls hosted on peer device." into lmp-mr1-wfc-dev
Tyler Gunn [Tue, 14 Apr 2015 18:19:36 +0000 (18:19 +0000)]
automerge: 6e0a2ef

* commit '6e0a2ef3da064aa783a827d8f3857b994e92b716':
  Prevent merging conference calls hosted on peer device.

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

Simple merge