tree 2b8cf61f40e083d2010deff4e1add58c9ab4e28e
parent 83b92fdba19ff01cd87b08e7ef2ffdfbcffcc3ce
parent 1c2a48e93ba4ef4693e9309c197241ca43d3d988
author Marco Miller <marco.miller@ericsson.com> 1549562050 -0500
committer Marco Miller <marco.miller@ericsson.com> 1549562050 -0500

Merge branch 'stable-2.16'

* stable-2.16:
  Update mockito-core to 2.24.0

Change-Id: I2aeec03fb7ac361ae158749fa78430bc69915129