tree a8fbcdc988ac8c4d0041fc83abd091f91eddfa32
parent 50b1cae4930cf5f51163c5c406f70fb7aabd4892
parent 91736d463f19c3310ec04a3f836b5e94e2d4bfdb
author Marco Miller <marco.miller@ericsson.com> 1553024003 -0400
committer Marco Miller <marco.miller@ericsson.com> 1553025337 -0400

Merge branch 'stable-2.16'

* stable-2.16:
  Upgrade mockito-core to 2.25.1

Change-Id: I18c2217167f2f244e4f9df16ce296da54265138c