tree d1323cbe315a071903c9379552db34203fde72be
parent c9f6945feb07ccc487225881d82d64d07fc0c89e
parent 20ea90a0e7f56d427789553e9d2709f1b3bc53a4
author David Pursehouse <dpursehouse@collab.net> 1555031027 +0900
committer David Pursehouse <dpursehouse@collab.net> 1555031027 +0900

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Upgrade mockito-core to 2.27.0

Change-Id: Ieb50aed638354e5eea4abf4d0c762adee7d11b86