OSDN Git Service

am 4143b796: Merge "Fixing conference merge where only one party is added to conferen...
authorTyler Gunn <tgunn@google.com>
Mon, 2 Feb 2015 15:53:00 +0000 (15:53 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 2 Feb 2015 15:53:00 +0000 (15:53 +0000)
commit235f60bc134646d1ce18ab872b982ff63b14845e
tree31594c93d8f847253c5c04e045a4d6593149a6bc
parentc6fc5287138744a4684a837c883dedde14359612
parent4143b796bc20072a12fe31cbfdf4f1918dff0728
am 4143b796: Merge "Fixing conference merge where only one party is added to conference." into lmp-mr1-dev

* commit '4143b796bc20072a12fe31cbfdf4f1918dff0728':
  Fixing conference merge where only one party is added to conference.