| commit | 5735ed53cb6d7d412093423b65947952d6d4d134 | [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:41 2015 +0000 |
| tree | df480641d9db3279a2296916dabe0d226f92a650 | |
| parent | 6eaa6db73229c55e4abd610822e857b0a4cc684f [diff] | |
| parent | f3245fd2f9fb95491ad390144e303cbf209992e8 [diff] |
Merge "Prevent merging conference calls hosted on peer device." into lmp-mr1-wfc-dev