tree 2d0161f31aa113d7d323005bb0960594c0883f13
parent 07cd9ee89f7afadab94a37ee27b7477b5eb1822d
parent 1858643bdb386480b32c398a0e1317efdca7549f
author David Pursehouse <dpursehouse@collab.net> 1553015390 +0000
committer David Pursehouse <dpursehouse@collab.net> 1553015390 +0000

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Upgrade mockito-core to 2.25.1

Change-Id: Ieec1933f225452ef609768160e84baec5c664af7