tree 50f087cbdec241df461e59ce889d17d5b8ead846
parent 0c99e8032dbf73603506e903d60a2a13870871d8
parent d40ff7104381df8046d3e680e9f54b1faecd1ae5
author Marco Miller <marco.miller@ericsson.com> 1600182483 -0400
committer Marco Miller <marco.miller@ericsson.com> 1600182483 -0400

Merge branch 'stable-3.0' into stable-3.1

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

Change-Id: I8bfca55d15def7f10098ce978e5684bc446eb8bf