tree e8a3954ba494ccf7737823acbc630b30a6172aa8
parent 6cc5ac4992e4a46162bc022669830fe039046e34
parent ce67e30bf7a91a3ff63f86020c2d91c248c3a71b
author Tyler Gunn <tgunn@google.com> 1428516923 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1428516943 +0000

Merge "Prevent merging conference calls hosted on peer device." into lmp-mr1-wfc-dev