| commit | e0f5dec28528a2bfa2f33db7bb1e1899514312ea | [log] [tgz] |
|---|---|---|
| author | Andrew Lee <anwlee@google.com> | Wed Nov 19 19:39:44 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 19 19:39:44 2014 +0000 |
| tree | f30d96df914e1a87161b0a4ca01b55bb02059509 | |
| parent | 518a4ad511adbb83c128967cb2decc218900dec3 [diff] | |
| parent | c30aaabf2a498c4fe11243b25a1d0eb1c833f4d5 [diff] |
am c30aaabf: Merge "Set GENERIC_CONFERENCE capability on CDMA conferences." into lmp-mr1-dev * commit 'c30aaabf2a498c4fe11243b25a1d0eb1c833f4d5': Set GENERIC_CONFERENCE capability on CDMA conferences.