| commit | ff85b1b5eca38561c9e743e1872d4aedf8e0af9b | [log] [tgz] |
|---|---|---|
| author | Ihab Awad <ihab@google.com> | Mon Oct 06 19:05:38 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Oct 06 19:05:38 2014 +0000 |
| tree | f7615cfc4b60b450812fcd5bbdd8ded969382307 | |
| parent | d5f97daed5fd6c4a0684d939e00e586d3fce4eef [diff] | |
| parent | 079bd15c102a656e570aba53f30c73118e75ac95 [diff] |
Merge "Disallow additional conferencing of full GSM conferences" into lmp-dev