Skip to content
Commit 4143b796 authored by Tyler Gunn's avatar Tyler Gunn Committed by Android (Google) Code Review
Browse files

Merge "Fixing conference merge where only one party is added to conference." into lmp-mr1-dev

parents dcce25a9 8a2b1199
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment