tree 5d3e5daa3a166c980f37b6c1ed507849a4754ea2
parent 35b3addfd1b3ef132d391a8f5f0466337d71325a
parent 27f3a419a2d0c9fd02844f8b549b1a1d20152bd8
author David Pursehouse <dpursehouse@collab.net> 1553015385 +0000
committer David Pursehouse <dpursehouse@collab.net> 1553015385 +0000

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Upgrade mockito-core to 2.25.1

Change-Id: Idab15c32856e07e531ad915b87f70634c8442dd0