tree f46615a14b693a566c88c65393d99e4d6f9f7c84
parent ca285dbf3975722ec0eb8d520ddb714ae8e3b899
parent bc00c718f4f29eebf4a53e16ea3884c5c3529f87
author David Pursehouse <dpursehouse@collab.net> 1551954575 +0900
committer David Pursehouse <dpursehouse@collab.net> 1551954575 +0900

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Upgrade mockito-core to 2.25.0

Change-Id: Ib4c5bb04e21a3439c2ef0311dbf353105a731776