Skip to content
Commit 235f60bc authored by Tyler Gunn's avatar Tyler Gunn Committed by Android Git Automerger
Browse files

am 4143b796: Merge "Fixing conference merge where only one party is added to... 

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

* commit '4143b796':
  Fixing conference merge where only one party is added to conference.
parents c6fc5287 4143b796
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