tree 4e21ef6814e00f06e511613e773e7ae1125ba69c
parent 298fa44e1667175486a51142abf59dc903d17abf
parent 81f965ab65a20998100cccbae34ff52bc0aa9d6f
author Marco Miller <marco.miller@ericsson.com> 1593626010 -0400
committer Marco Miller <marco.miller@ericsson.com> 1593626010 -0400

Merge branch 'stable-3.1' into stable-3.2

* stable-3.1:
  e2e-tests: Replace value of 1 with reused constant

Change-Id: I7f38bb744e5e398fd37377dea29d21b3ed67809f