tree 69d05926e92a09e6bfd754dd740bec65094c3da5
parent e1261e38dd5d692cc84f8ea054234c4920362e4b
parent 91cf34975ff88e6f8af155f995f0d94bed36d9de
author Marco Miller <marco.miller@ericsson.com> 1554839231 -0400
committer Marco Miller <marco.miller@ericsson.com> 1554839231 -0400

Merge branch 'stable-2.16'

* stable-2.16:
  Upgrade mockito-core to 2.26.0

Change-Id: I2c05d09d998e3ee50b0088e0ac79057288ca4063