tree 4fa1c12bf4a265493627688fa45db82ceb940609
parent bedfe394ce7e25564ffbc5b5c79e701dd1ebf508
parent d69f6a7a8edcb7878f5d74fa544e74178d5ba120
author Marco Miller <marco.miller@ericsson.com> 1560344197 -0400
committer Marco Miller <marco.miller@ericsson.com> 1560344197 -0400

Merge branch 'stable-3.0'

* stable-3.0:
  Upgrade mockito-core to 2.28.2

Change-Id: I7eec2d2566ccac3dcccde055ea8ec047fd54cadd