tree 5a011effcf88152092ed1c1acec2e8f02db77552
parent fdc7ec4efb03b983b3c847002140ae632809aa5b
parent d9cca30f9329748e4e6d444354328aafe4521e54
author Marco Miller <marco.miller@ericsson.com> 1560275600 -0400
committer Marco Miller <marco.miller@ericsson.com> 1560275600 -0400

Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Upgrade mockito-core to 2.28.2

Change-Id: I360df69e68aebe2fa5679509be51d483080289e9