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:56:16 +0000 (15:56 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 2 Feb 2015 15:56:16 +0000 (15:56 +0000)
commitc1c9c3199e009b1345654ad5e13560eaa448a9fe
tree7faaf5ee801547c7c20b37476b6484be5c1c022c
parentcd97a641eb5e903774a50cdb5e27768a28633dcb
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.