tree 79ada4430673b0550ef53f366ff506d364b78142
parent d2aafa5ea6ab7f7c0c2eaad8ee4c7c788ec3ebf8
parent dfeee1fbb43dd2d2f3df10837b5be6962472b99b
author Marco Miller <marco.miller@ericsson.com> 1600182533 -0400
committer Marco Miller <marco.miller@ericsson.com> 1600182533 -0400

Merge branch 'stable-3.1' into stable-3.2

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

Change-Id: I824c7d4d298a6328756efe462f5b5b43cffe65ca