| commit | 4143b796bc20072a12fe31cbfdf4f1918dff0728 | [log] [tgz] |
|---|---|---|
| author | Tyler Gunn <tgunn@google.com> | Mon Feb 02 15:48:52 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Feb 02 15:48:53 2015 +0000 |
| tree | aa64684d6ea1f69a6f8c245fbc48d08fa579d087 | |
| parent | dcce25a9a7fb3458f2fb65b23912b5f7eb42c596 [diff] | |
| parent | 8a2b1199a6db0c6f2493e96e25ec1d89e3f62769 [diff] |
Merge "Fixing conference merge where only one party is added to conference." into lmp-mr1-dev