tree ca8401366d1fdd09a4a7ba9df4f4fee4a7dd7cef
parent ade7dbb41cfeae1180c77821233b378a915cdcbb
parent 791496d8a63ad64f95b4957bb322238cf6e66b4d
author David Pursehouse <dpursehouse@collab.net> 1551954579 +0900
committer David Pursehouse <dpursehouse@collab.net> 1551954579 +0900

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Upgrade mockito-core to 2.25.0

Change-Id: I94658af2a915b200fc54fb0b5634e93680543621