OSDN Git Service

Merge "Fixing conference merge where only one party is added to conference." into...
authorTyler Gunn <tgunn@google.com>
Mon, 2 Feb 2015 15:48:52 +0000 (15:48 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 2 Feb 2015 15:48:53 +0000 (15:48 +0000)
commit4143b796bc20072a12fe31cbfdf4f1918dff0728
treeaa64684d6ea1f69a6f8c245fbc48d08fa579d087
parentdcce25a9a7fb3458f2fb65b23912b5f7eb42c596
parent8a2b1199a6db0c6f2493e96e25ec1d89e3f62769
Merge "Fixing conference merge where only one party is added to conference." into lmp-mr1-dev