| commit | c1c9c3199e009b1345654ad5e13560eaa448a9fe | [log] [tgz] |
|---|---|---|
| author | Tyler Gunn <tgunn@google.com> | Mon Feb 02 15:56:16 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Feb 02 15:56:16 2015 +0000 |
| tree | 7faaf5ee801547c7c20b37476b6484be5c1c022c | |
| parent | cd97a641eb5e903774a50cdb5e27768a28633dcb [diff] | |
| parent | 4143b796bc20072a12fe31cbfdf4f1918dff0728 [diff] |
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.