tree 4457368bae5064f3eee5964de7ee114373083d43
parent ea9be3a4684ad418b459765cf2ec856b87693052
parent 0f57de4e79917a85be1409bde60be68b3fd20bd9
author Marco Miller <marco.miller@ericsson.com> 1600181630 -0400
committer Marco Miller <marco.miller@ericsson.com> 1600181630 -0400

Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Refine protocol assignment in scenarios using multiple protocols

Change-Id: Ia2d6512ee38b0569138ef355e3b5b6b26e1c7b28