tree 052a338125f8246901dfd6c1e2ec24b9aba4fe75
parent e133ca70b65cc9b9cd82392183ab7304ab402f7a
parent a717e85cdd870bc3013b28a9bfae0ad4faed9fcc
author Tyler Gunn <tgunn@google.com> 1527184834 -0700
committer android-build-merger <android-build-merger@google.com> 1527184834 -0700

Merge "IMS-VT: Set Video State of Conference Participant Connection"
am: a717e85cdd

Change-Id: Ic2136ba37c7e29fe8da32760f8e2e6064b93ebf9