| commit | 235f60bc134646d1ce18ab872b982ff63b14845e | [log] [tgz] |
|---|---|---|
| author | Tyler Gunn <tgunn@google.com> | Mon Feb 02 15:53:00 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Feb 02 15:53:00 2015 +0000 |
| tree | 31594c93d8f847253c5c04e045a4d6593149a6bc | |
| parent | c6fc5287138744a4684a837c883dedde14359612 [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.