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