tree 30d8c47ad53ff70647debf531d71beb438fdd791
parent e81a6d6a439187a44a6873a95d5e9098b5356845
parent ab118208f8dc259a0e15e2f874f687460483bec5
author David Pursehouse <dpursehouse@collab.net> 1559259729 +0900
committer David Pursehouse <dpursehouse@collab.net> 1559259729 +0900

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Upgrade mockito-core to 2.28.2

Change-Id: I2c247c7d46e49ffb80edda7cc38f22d5beb61fb3