tree 0b448e4e2f1a27d12a797d3f92354ab8abd05b52
parent 95f7f105d00b07876235ead7eca787d4b71abc1d
parent a72329225900ea18c17a460ce5453b4309ef2e89
author David Pursehouse <dpursehouse@collab.net> 1551954576 +0900
committer David Pursehouse <dpursehouse@collab.net> 1551954576 +0900

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Upgrade mockito-core to 2.25.0

Change-Id: I5a1d275fc9773267dd70bd20f688b0fb9742c084