commit | 5b326ce011fe6c42098ca2967d5664fcce48a889 | [log] [tgz] |
---|---|---|
author | Tyler Gunn <tgunn@google.com> | Wed Apr 08 18:15:23 2015 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Apr 08 18:15:43 2015 +0000 |
tree | e8a3954ba494ccf7737823acbc630b30a6172aa8 | |
parent | 6cc5ac4992e4a46162bc022669830fe039046e34 [diff] | |
parent | ce67e30bf7a91a3ff63f86020c2d91c248c3a71b [diff] |
Merge "Prevent merging conference calls hosted on peer device." into lmp-mr1-wfc-dev