tree 4f6156a9726fc30ed9ca4755ffebe1942cc4052a
parent c79355142f7764f41bea20cee424630bdee5f1b5
parent d11f1bc05d8e1d2239241cef63a9595f097d0b30
author Marco Miller <marco.miller@ericsson.com> 1600181669 -0400
committer Marco Miller <marco.miller@ericsson.com> 1600181669 -0400

Merge branch 'stable-3.1' into stable-3.2

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

Change-Id: I2d753513d89789a49f2834fe4a2a81c74992bde3