| commit | c30aaabf2a498c4fe11243b25a1d0eb1c833f4d5 | [log] [tgz] |
|---|---|---|
| author | Andrew Lee <anwlee@google.com> | Wed Nov 19 19:29:41 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Nov 19 19:29:42 2014 +0000 |
| tree | ce4b9bd202ccf6d209ae7bfe291c09ea3d2e2667 | |
| parent | a0af834fc58994b6d6f7a92addca976dd5b16748 [diff] | |
| parent | dc54843caff3c706461d30b7f8476b2d82d054fa [diff] |
Merge "Set GENERIC_CONFERENCE capability on CDMA conferences." into lmp-mr1-dev