| commit | 36a0afc410662b57627e023441f25112fb589a53 | [log] [tgz] |
|---|---|---|
| author | Ihab Awad <ihab@google.com> | Mon Oct 06 19:17:13 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 06 19:17:13 2014 +0000 |
| tree | a4d6432b0185496feb4997110be4f011d100d2da | |
| parent | 98151a0dc8eabf2f3a8adba6904ad3b7473055f2 [diff] | |
| parent | ff85b1b5eca38561c9e743e1872d4aedf8e0af9b [diff] |
am ff85b1b5: Merge "Disallow additional conferencing of full GSM conferences" into lmp-dev * commit 'ff85b1b5eca38561c9e743e1872d4aedf8e0af9b': Disallow additional conferencing of full GSM conferences