Merge remote-tracking branch 'origin/feature-slice+restart-w35' into develop_integration_2018_w36
Conflicts: openair2/ENB_APP/flexran_agent_common_internal.c openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
This diff is collapsed.
This diff is collapsed.