tree eebc26de6fc0bfa6cbcf396d1eb147d651f238e6
parent 3439c846cb421dc20098f5f5e6d9d9b34e580bf3
parent 59dedc2bacbf9c94f02a7e1a072eb6b5ef451b22
author David Pursehouse <dpursehouse@collab.net> 1551954577 +0900
committer David Pursehouse <dpursehouse@collab.net> 1551954577 +0900

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Upgrade mockito-core to 2.25.0

Change-Id: Ic4aea0e366570ed0bfc894c98aa71b525d3fcd07