tree b39a791e6810ffcc01328434625edc223eb95240
parent 12b356e493eda12e575cae4f18ea5a9734c6e35d
parent 56f8eb114e260f4c2a8e99c6f6de06a219f5d503
author Marco Miller <marco.miller@ericsson.com> 1560275598 -0400
committer Marco Miller <marco.miller@ericsson.com> 1560275598 -0400

Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Upgrade mockito-core to 2.28.2

Change-Id: Ifae6ae7e4bc78a22c4f73ceec77533990ac2ebf9