tree 94e9a64aac58704f7efe40f92cbd7231d053ba96
parent e533f66177cda9e301ca5d864228dca3137cd57e
parent d9eb2149205ff06f016443c97e3c197ced006b00
author David Pursehouse <dpursehouse@collab.net> 1555033330 +0900
committer David Pursehouse <dpursehouse@collab.net> 1555033330 +0900

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Upgrade mockito-core to 2.27.0

Change-Id: Iba4651c307b7795f2b4e1b42eed60821e2747f1c