tree 3330cc33a35794db8ad8667b5a5a7c4404311262
parent 8395ba396dbea895dad4f434c91930cec02d9be0
parent fa1e97e57f1024f9f85e5e3d54f9af44b27ce213
author Tyler Gunn <tgunn@google.com> 1462221045 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1462221046 +0000

Merge "Ensure connection video capabilities can only be set if video supported." into nyc-dev