tree 03b7c200c2408952218afdac4dada33ebcb2741e
parent 2c2d5cb849253a45ded602f79acaeb04c1a189b1
parent 5fee69c1ab243a1c949589e7a3bfce71cdc54d24
author Marco Miller <marco.miller@ericsson.com> 1560344195 -0400
committer Marco Miller <marco.miller@ericsson.com> 1560344195 -0400

Merge branch 'stable-3.0'

* stable-3.0:
  Upgrade mockito-core to 2.28.2

Change-Id: Ieb49b154fefc4dd39361d263361aabd05049ff96