tree 6e12cddcdc6896a57fc050a0313d7ce6c09c5c42
parent bbc03b8d414aef4ab71960e86bed02ff6145ca38
parent 199d5468de11f2d0f51109ac38b216e6e1105a24
author Marco Miller <marco.miller@ericsson.com> 1554839232 -0400
committer Marco Miller <marco.miller@ericsson.com> 1554839232 -0400

Merge branch 'stable-2.16'

* stable-2.16:
  Upgrade mockito-core to 2.26.0

Change-Id: I5e42859691fda58161bb1a6832fa655745db4e11