commit | 6e0a2ef3da064aa783a827d8f3857b994e92b716 | [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:27 2015 +0000 |
tree | ed2ae8250a8c39f5af3ddef56428f6eddc6e9866 | |
parent | 61d41c1f9ba249bd0df575cc1b551a9e70f54645 [diff] | |
parent | 25394099999f724f7806cbc7119ecca3708cf3b3 [diff] |
Merge "Prevent merging conference calls hosted on peer device." into lmp-mr1-wfc-dev