tree 31ec52cfe1b688898cb384d26273ac1116c2a15d
parent d381bc31336dbd0ac12152d76275688dea157e79
parent 04ce7578607e022e980f69a45bccfa6f84ad6785
author Tyler Gunn <tgunn@google.com> 1471300322 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1471300323 +0000

Merge "Add missing remote conference property set." into nyc-mr1-dev