tree 821f0113c41ce7d2841c2e25b394f3dc03f98171
parent 586493efdd77a62bdd331cd34382893d1fd380ae
parent 002927aafa18e66d3bf9091b4d958b7e389e93a9
author Marco Miller <marco.miller@ericsson.com> 1555096918 -0400
committer Marco Miller <marco.miller@ericsson.com> 1555096918 -0400

Merge branch 'stable-2.16'

* stable-2.16:
  Upgrade mockito-core to 2.27.0

Change-Id: I36fb7ea8654f3a5f009cdb49c9fa94cba199d7db