tree ef1660f2c0be96cc8e50800ee54edfd5b0008737
parent b0b6fd14672ae4c8a5c78bfcf0a51f2940aacc9d
parent cdcbdfa175eb8026063a7be33ade89683d192bef
author Marco Miller <marco.miller@ericsson.com> 1560344192 -0400
committer Marco Miller <marco.miller@ericsson.com> 1560344192 -0400

Merge branch 'stable-3.0'

* stable-3.0:
  Upgrade mockito-core to 2.28.2

Change-Id: Icbed15c670753178fb600b4ffb32330eb3fd718f