tree e8241765a601606116fc559ead2da1075647f832
parent 6449d55789d0f6275d59ee0cf05080506462cd90
parent e533f66177cda9e301ca5d864228dca3137cd57e
author Marco Miller <marco.miller@ericsson.com> 1554839233 -0400
committer Marco Miller <marco.miller@ericsson.com> 1554839233 -0400

Merge branch 'stable-2.16'

* stable-2.16:
  Upgrade mockito-core to 2.26.0

Change-Id: Ibd8ae5521cc21f290d97ace9a3423357d1b2f9ef