am 95be7c68: IMS: Conference changes
authorUma Maheswari Ramalingam <umam@codeaurora.org>
Thu, 11 Jun 2015 15:57:30 +0000 (15:57 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 11 Jun 2015 15:57:30 +0000 (15:57 +0000)
commitdf393e9776b983c51c97c1343032bfa9d20f39a3
tree733a417116aa5306cb7c8aa21268172deb9ad51e
parent8887294f480ccedb16c1938c2214e08580d2d7cc
parent95be7c68495a3a22c45b8d7867bf5c0246513adb
am 95be7c68: IMS: Conference changes

* commit '95be7c68495a3a22c45b8d7867bf5c0246513adb':
  IMS: Conference changes
src/java/com/android/ims/ImsCall.java
src/java/com/android/ims/internal/ImsCallSession.java