OSDN Git Service

am 5926650d: am 7461b5a0: Merge "Adding support for Cdma conference calling." into...
authorSailesh Nepal <sail@google.com>
Fri, 26 Sep 2014 04:40:34 +0000 (04:40 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 26 Sep 2014 04:40:34 +0000 (04:40 +0000)
commitfaed92cdd21856b022f909ceb7a0c967a7b6477d
tree991dcb61798fc769348f956dd2996cb8e22d2bd3
parentd9aa906e211d3df3a31c1d2b8c663344d38adf35
parent9bcda324758a8ebbf8064263b7d784031934e7b2
am 5926650d: am 7461b5a0: Merge "Adding support for Cdma conference calling." into lmp-dev

* commit '5926650d6099469981369cf5235da6d2b135ba0d':
  Adding support for Cdma conference calling.
telecomm/java/android/telecom/RemoteConference.java