tree ed2ae8250a8c39f5af3ddef56428f6eddc6e9866
parent 61d41c1f9ba249bd0df575cc1b551a9e70f54645
parent 25394099999f724f7806cbc7119ecca3708cf3b3
author Tyler Gunn <tgunn@google.com> 1428516923 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1428516927 +0000

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