tree 02132006d20f4b8f979fd395f13adcd131761eea
parent 8cc6837322236a51cf7f52d621f3593ae2d95833
parent 9d13446e533c3442d7478008049f8539e75d1439
author Marco Miller <marco.miller@ericsson.com> 1554839230 -0400
committer Marco Miller <marco.miller@ericsson.com> 1554839230 -0400

Merge branch 'stable-2.16'

* stable-2.16:
  Upgrade mockito-core to 2.26.0

Change-Id: I6206fe302c264e7273daaf5cc98da00c1e8201b8