Merge "Prevent merging conference calls hosted on peer device." into lmp-mr1-wfc-dev
authorTyler Gunn <tgunn@google.com>
Tue, 14 Apr 2015 18:19:36 +0000 (18:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 14 Apr 2015 18:19:36 +0000 (18:19 +0000)
commit3aa94b061b774e780aa8126b277a0e3c8ae1c2a5
treea003dda9b9976cd8f8647db364e86962a93c3ea4
parent5aec2e957365f20b2e75d3b8c7034e3289729b81
parent6e0a2ef3da064aa783a827d8f3857b994e92b716
Merge "Prevent merging conference calls hosted on peer device." into lmp-mr1-wfc-dev
automerge: 6e0a2ef

* commit '6e0a2ef3da064aa783a827d8f3857b994e92b716':
  Prevent merging conference calls hosted on peer device.
src/java/com/android/ims/ImsCall.java
src/java/com/android/ims/internal/ImsCallSession.java