tree 6a23762c660cd14601dcbee3aba82cb6bb08512d
parent 998414e4ad23daa4274c566b704e76f4e3f33287
parent 8a35a92901e2670c74979ff12c89e19fc81439fd
author Marco Miller <marco.miller@ericsson.com> 1560344196 -0400
committer Marco Miller <marco.miller@ericsson.com> 1560344196 -0400

Merge branch 'stable-3.0'

* stable-3.0:
  Upgrade mockito-core to 2.28.2

Change-Id: I66650e99adc4baafd8e16d63dc89242daaa16063