tree 738f7620e467b7218bd1b023eb30a39884bcad31
parent 8dd91c21638ec20efdca3f0583df0381ee8f0201
parent df270ebfe83cc75c702e8f0009e9fb4ce5668e09
author David Pursehouse <dpursehouse@collab.net> 1552954304 +0000
committer David Pursehouse <dpursehouse@collab.net> 1552954304 +0000

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Upgrade mockito-core to 2.25.1

Change-Id: I6746193d2f15df9098fd5692bc25c51a7adb677d