tree bb04f854c77194aefeac275a36cec1bc91dbb745
parent de41dc7f7034f20a9a03f0b9c932bad8b9923154
parent 3db36014c1387f3ee8d73cd5bed5549414019b0e
author Marco Miller <marco.miller@ericsson.com> 1560344193 -0400
committer Marco Miller <marco.miller@ericsson.com> 1560344193 -0400

Merge branch 'stable-3.0'

* stable-3.0:
  Upgrade mockito-core to 2.28.2

Change-Id: Ic1d02ebc80039d91e75985fc573c32fadbb8945e